SteamWar/BauSystem
Archiviert
13
0
Commit graph

641 Commits

Autor SHA1 Nachricht Datum
Chaoscaot
2eba7c3cb5 Merge remote-tracking branch 'origin/dt_rework' into dt_rework 2021-03-25 13:48:01 +01:00
Chaoscaot
af87505532 Add Offhand 2021-03-25 13:47:53 +01:00
yoyosource
0f970e3a49 Reformat Detonator 2021-03-25 08:47:21 +01:00
Chaoscaot
b533e27b85 Removing Debug Messages 2021-03-25 07:54:43 +01:00
Chaoscaot
ca7b87f466 Minor DT Rework 2021-03-24 21:45:35 +01:00
ab81466a33 Merge pull request 'Add variable reference support to internal commands' (#207) from ScriptSystemImprovements into master
Reviewed-on: #207
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-03-24 17:29:58 +01:00
yoyosource
704a50b9b6 Fix ScriptListener 2021-03-20 12:45:24 +01:00
yoyosource
f3f17710e0 Merge branch 'master' into ScriptSystemImprovements
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/world/ScriptListener.java
2021-03-20 12:44:35 +01:00
9e89fe6780 Merge pull request 'Formatted every File!' (#206) from NamingAndFormating into master
Reviewed-on: #206
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-03-20 12:39:36 +01:00
yoyosource
48a60e19b3 Add Logic to ScriptListener
Add Input to ScriptListener
2021-03-20 12:31:17 +01:00
yoyosource
de68dc00f1 Fix CommandScript 2021-03-19 22:41:30 +01:00
yoyosource
c4564e313a Fix ScriptListener
Fix RecordStatus
2021-03-19 22:27:57 +01:00
yoyosource
a7e45111f5 Add variable reference support to internal commands
Add arithmetic commands
Add auto_trace constant
2021-03-13 15:06:42 +01:00
yoyosource
50decb6a4a Add variable reference support to internal commands
Add arithmetic commands
Add auto_trace constant
2021-03-13 14:43:39 +01:00
yoyosource
a26d816f12 Merge branch 'master' into NamingAndFormating
# Conflicts:
#	BauSystem_15/src/de/steamwar/bausystem/commands/CommandDebugStick_15.java
#	BauSystem_Main/src/de/steamwar/bausystem/commands/CommandDetonatorTabCompleter.java
#	BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSimulatorTabCompleter.java
#	BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTNTTabComplete.java
2021-03-12 10:42:35 +01:00
83a97944bf Merge pull request 'Add SWUtils' (#205) from SWUtils into master
Reviewed-on: #205
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-03-12 10:38:47 +01:00
yoyosource
aa77cb9c29 Formatted every File!
Renamed IAutoLoader to AbstractAutoLoader
2021-03-12 09:31:37 +01:00
yoyosource
d047fa1dd1 Add SWUtils 2021-03-12 09:18:48 +01:00
0048eb10b2 Merge pull request 'Add TNTSimulator count' (#203) from Simulator into master
Reviewed-on: #203
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-03-08 01:17:41 +01:00
yoyosource
e7eb12e4b7 Add TNTSimulator count 2021-03-07 16:59:16 +01:00
d07f7d773b Merge pull request 'Detonator on Item Locations' (#197) from multi-detonator into master
Reviewed-on: #197
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-03-07 10:58:30 +01:00
Chaoscaot
7185001258 Merge branch 'master' into multi-detonator 2021-03-07 10:53:49 +01:00
27f9e70492 Merge pull request 'CannonSimulator' (#164) from CanonSimulator into master
Reviewed-on: #164
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-03-07 10:47:35 +01:00
yoyosource
c6791f394c Update pr stuff 2021-03-07 10:38:52 +01:00
yoyosource
8b46d6fe69 Update pr stuff 2021-03-07 10:34:58 +01:00
yoyosource
801211c57d Update pr stuff 2021-03-07 10:25:05 +01:00
417f4d3965 Merge branch 'master' into CanonSimulator 2021-03-07 10:23:53 +01:00
yoyosource
5b1a1a2f69 Optimize CommandGUI 2021-03-06 21:35:59 +01:00
yoyosource
bed5a74c10 Add Simulator Wand to CommandGUI 2021-03-06 21:35:33 +01:00
yoyosource
9a1c900a71 Add CommandSimulator
Add TNTSimulator
2021-03-06 21:23:35 +01:00
Chaoscaot
cb87d69327 Merge branch 'master' into multi-detonator 2021-03-06 17:18:26 +01:00
f3937990ca Merge pull request 'Add Region.extensionArea' (#196) from ExtensionAreaBoolean into master
Reviewed-on: #196
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-03-05 20:15:26 +01:00
30f870d668 Merge branch 'master' into ExtensionAreaBoolean 2021-03-05 20:14:33 +01:00
yoyosource
549efa9801 Fix pr stuff 2021-03-05 20:13:15 +01:00
Chaoscaot
12aae48d24 Adding back CommandGUI Listener 2021-03-02 08:26:29 +01:00
Chaoscaot
44add96599 Merge branch 'master' into multi-detonator
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
2021-02-27 15:01:15 +01:00
jojo
ab8f0db420 Merge branch 'master' into CannonSimulator
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
#	BauSystem_Main/src/plugin.yml
2021-02-27 09:18:23 +01:00
c7a9b13bbe Merge pull request 'Improve ItemGiver' (#200) from ItemGiver into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-02-26 12:45:31 +01:00
jojo
cd6ad1a85d Fix Item giving 2021-02-25 13:50:08 +01:00
0b0b9323cc Merge pull request 'Revert "Itemgiver improvements" due to player complaints' (#198) from revert-itemgiver-improvements into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-02-25 13:29:09 +01:00
jojo
bb598ba8ad Hotfix CommandReset NPE
Hotfix CommandTestblock NPE
2021-02-25 13:23:52 +01:00
3c029adba2 Revert "Itemgiver improvements" due to player complaints 2021-02-25 11:27:30 +01:00
08d795579d Merge pull request 'ChaosBauGUI' (#183) from ChaosBauGUI into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-02-24 19:16:16 +01:00
Chaoscaot
98286a6153 Fix 2021-02-23 11:08:15 +01:00
jojo
79fb836edc Add Region.Prototype.extensionPrototypeArea 2021-02-22 12:47:16 +01:00
Chaoscaot
48893d1a48 Improve Detonator Saving Structure and Saving Locations on Items in 1.15 2021-02-20 17:01:41 +01:00
jojo
185387c7b2 Add Region.Prototype.extensionPrototypeArea 2021-02-17 14:45:09 +01:00
jojo
0a60393cc3 Add Region.Prototype.extensionPrototypeArea 2021-02-17 14:44:46 +01:00
jojo
b7f1834137 Fix pr stuff 2021-02-17 14:36:32 +01:00
Chaoscaot
8c216527f7 Code Refactor 2021-02-17 14:32:27 +01:00