SteamWar/BauSystem
Archiviert
13
0
Commit graph

477 Commits

Autor SHA1 Nachricht Datum
yoyosource
7ef027c921 Merge branch 'master' into RegionFix
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/world/Region.java
2021-03-20 12:47:14 +01:00
yoyosource
5c31db3867 Fix Region 2021-03-14 18:33:54 +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
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
yoyosource
e7eb12e4b7 Add TNTSimulator count 2021-03-07 16:59:16 +01:00
Chaoscaot
7185001258 Merge branch 'master' into multi-detonator 2021-03-07 10:53:49 +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
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
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
jojo
eadc741137 Add Region.extensionArea
Add Region.extensionAreaEnabled
2021-02-17 10:06:51 +01:00
jojo
67b40433d8 Fix pr stuff 2021-02-16 11:47:13 +01:00
jojo
2635f98afc Merge branch 'master' into CannonSimulator 2021-02-16 11:37:52 +01:00
10ef5cb536 Merge pull request 'Fix GuiTraceShow' (#195) from TraceFix into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-02-16 11:37:17 +01:00
jojo
5aaa1aaa38 Fix pr stuff 2021-02-15 10:37:20 +01:00
jojo
870bbd94f0 Fix pr stuff 2021-02-14 18:09:08 +01:00
jojo
38eef6f0a1 Fix pr stuff 2021-02-14 14:47:39 +01:00
jojo
311c41383b Fix GuiTraceShow 2021-02-14 14:45:30 +01:00
jojo
dbcadcfa0c Fix pr stuff 2021-02-14 11:24:06 +01:00
jojo
7025dabd8a Fix GuiTraceShow 2021-02-14 11:19:46 +01:00
Chaoscaot
8f176cd8cd Fixing some 1.12 Stuff 2021-02-13 23:46:50 +01:00
Chaoscaot
35902fac56 Improve some Stuff 2021-02-13 22:52:26 +01:00
Chaoscaot
2610359d67 Improve Give Commands 2021-02-13 09:33:01 +01:00
Chaoscaot
94c4d8107e Fixing Some PR Stuff 2021-02-13 09:31:16 +01:00
Chaoscaot
79aab75d18 Merge branch 'master' into ChaosBauGUI 2021-02-13 09:29:36 +01:00
jojo
b523747394 Fix pr stuff 2021-02-12 17:06:53 +01:00
jojo
3f39066209 Fix pr stuff 2021-02-12 16:20:22 +01:00
48346b1bc2 Merge pull request 'Add TPS warping to TPSLimit' (#192) from TPSWarp into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-02-12 11:08:58 +01:00