SteamWar/BauSystem
Archiviert
13
0
Commit graph

478 Commits

Autor SHA1 Nachricht Datum
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
jojo
e6417bd578 Fix pr stuff 2021-02-12 11:01:58 +01:00
jojo
a16a299962 Fix pr stuff 2021-02-11 19:47:40 +01:00
jojo
8802828676 Fix pr stuff 2021-02-11 19:39:06 +01:00
jojo
813b8803b4 Fix CommandTPSLimiterTabComplete 2021-02-09 21:20:36 +01:00
jojo
97926c08d5 Optimize TPSLimit_15
Optimize CommandInfo
Optimize CommandTPSLimiter
Optimize CommandTPSLimiterTabComplete
Optimize BauScoreboard
Optimize TPSUtils
2021-02-09 21:14:52 +01:00
jojo
5372f84409 Optimize CommandInfo 2021-02-09 21:07:24 +01:00
0c3a4f24db Merge pull request 'VersionedRunnable' (#193) from VersionedRunnable into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-02-09 09:26:14 +01:00
jojo
1696aa4e54 Add VersionedRunnable to ScriptListener 2021-02-08 21:03:00 +01:00
jojo
d45c39c528 Add VersionedRunnable to RegionListener 2021-02-08 21:02:47 +01:00
jojo
9dc5c535f5 Add VersionedRunnable to Region 2021-02-08 21:02:31 +01:00
jojo
461e6d17a0 Add VersionedRunnable to AutoLoader 2021-02-08 21:02:19 +01:00
jojo
de2f4a1c53 Add VersionedRunnable to CommandDebugStick 2021-02-08 20:56:18 +01:00
jojo
de28cc9c1d Fix pr stuff 2021-02-08 20:48:45 +01:00
jojo
a41602bd37 Add TPS warping to TPSLimit 2021-02-08 18:40:43 +01:00
Chaoscaot
05aa50d8f3 Fix Typo 2021-02-08 17:57:46 +01:00
Chaoscaot
ed1c03e0ac Fix Message 2021-02-08 17:49:20 +01:00
02d509a3ab Merge pull request 'Add CommandTNT with extension explode message' (#189) from ExtensionTNT into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-06 21:52:16 +01:00
jojo
fc44167ea0 Add tnt message with OFF mode 2021-02-06 21:47:48 +01:00
jojo
f151c6e69a Simplify CommandTNT methods 2021-02-06 21:44:00 +01:00
Chaoscaot
81c510c8cc Fix some Formatting and Inventory Stuff 2021-02-06 18:25:49 +01:00
jojo
fb73fa6fce Add CommandTNT with extension explode message 2021-02-06 17:08:01 +01:00
d74b29e1c3 Merge pull request 'Fix Signedit' (#188) from edit-signs into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-06 15:46:36 +01:00
Chaoscaot
76cf208379 Fix Signedit 2021-02-06 15:43:50 +01:00
2b068041e7 Merge pull request 'Add Extensions' (#187) from Extensions into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-06 15:39:31 +01:00
Chaoscaot
fee6807d3b Fix Signedit 2021-02-06 15:37:53 +01:00
Chaoscaot
2fae702489 Fix Signedit 2021-02-06 15:37:12 +01:00
jojo
2950ddda36 Simplify Region 2021-02-06 15:36:23 +01:00
jojo
7cfc8a9594 Simplify Region 2021-02-06 15:18:28 +01:00
jojo
9d07f192a7 Simplify Region 2021-02-06 15:15:52 +01:00
Chaoscaot
0041088546 Add Lore to Script Books 2021-02-06 14:24:38 +01:00
jojo
863f06673f Add Region.ExtensionDirection
Add Region.Prototype.extensionFrontDirection
2021-02-06 13:26:52 +01:00
jojo
dce3e96abf Add Region.Prototype.extensionFront
Add Region.Prototype.extensionBack
Add Region.Prototype.extensionUp
Add Region.Prototype.extensionSides
2021-02-06 13:17:42 +01:00
Chaoscaot
d36700e663 Fix Debugstick in 1.12 and some more things 2021-02-06 01:47:25 +01:00
Chaoscaot
d825a19a98 Add Script Book Inventory 2021-02-06 01:41:25 +01:00
f94171cbe2 Merge pull request 'Sign edit only with Empty hand' (#186) from edit-signs into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-02-05 20:39:17 +01:00
Chaoscaot
f8871d6a8e Sign edit only with Empty hand 2021-02-05 18:45:35 +01:00
Chaoscaot
bd7fbb33a2 Changesset 2021-02-04 22:30:09 +01:00
Chaoscaot
7c4b944c4d Change Layout 2021-02-04 21:24:04 +01:00
Chaoscaot
d557e164ba Some TM Fixes and Inventory Layout 2021-02-04 20:56:25 +01:00
jojo
bcb964fdb4 Change TNTSimulator 2021-02-04 20:24:51 +01:00
jojo
7a356b7f28 Hotfix MovingTNTBlock 2021-02-04 10:25:54 +01:00
jojo
8922e472bf Fix Freeze in 1.12 2021-02-04 10:09:49 +01:00
jojo
08ae545820 Fix Freeze Exceptions 2021-02-04 10:06:26 +01:00
jojo
180ab0f8a4 Fix Freeze Exceptions 2021-02-04 10:00:44 +01:00
jojo
dfb6770453 Fix Freeze Exceptions 2021-02-04 09:55:39 +01:00
Chaoscaot
032a4c75d6 Adding and Fixing more Stuff 2021-02-03 23:52:23 +01:00
Chaoscaot
f00d8324d6 Merge branch 'master' into ChaosBauGUI 2021-02-03 21:22:40 +01:00
jojo
cf7ae0fa09 Optimize Imports 2021-02-03 21:10:59 +01:00
jojo
97d626fcb3 Simplify RegionSystem 2021-02-03 21:08:59 +01:00
Chaoscaot
886cf5607d New Region System 2021-02-03 21:01:21 +01:00
jojo
828fb025aa Simplify RegionSystem 2021-02-03 21:00:22 +01:00
Chaoscaot
a7df81aca5 Merge branch 'master' into ChaosBauGUI
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java
#	BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTNT.java
#	BauSystem_Main/src/de/steamwar/bausystem/world/Region.java
2021-02-03 20:35:48 +01:00
Chaoscaot
9b70227f74 Merge branch 'master' into edit-signs 2021-02-03 20:15:31 +01:00
Chaoscaot
0b95df4bda Expanding Inventory 2021-02-03 20:14:52 +01:00
jojo
7cb2f224a2 Fix freeze allow building of tnt 2021-02-03 20:07:40 +01:00
jojo
5c73e5874d Fix Sound of TNT ignite with freeze enabled 2021-02-03 19:41:00 +01:00
jojo
375885bbde Fix Sound of TNT ignite with freeze enabled 2021-02-03 19:37:52 +01:00
jojo
475f93426c Simplify CommandTNT for Region without Testblock 2021-02-03 18:09:16 +01:00
jojo
d406ed7e66 Fix CommandTNT for Region without Testblock 2021-02-03 18:06:30 +01:00
jojo
f977837175 Simplify TNTSimulator.start 2021-02-03 16:53:37 +01:00
jojo
4648186c1a Fix pr stuff 2021-02-03 15:39:06 +01:00
jojo
168819e5c8 Fix pr stuff 2021-02-03 15:38:12 +01:00
jojo
16ad0ad5e6 Optimize Imports 2021-02-03 14:31:24 +01:00
jojo
7b4c0681d0 Fix copyright 2021-02-03 14:30:59 +01:00
jojo
911385a5af Merge branch 'master' into RegionSystem
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java
2021-02-03 14:03:47 +01:00
jojo
709e6f11dc Fix tnt spawning on redstone sources 2021-02-03 11:13:33 +01:00
jojo
88b9ae0ec4 Fix tnt spawning on redstone sources 2021-02-03 11:12:27 +01:00
Chaoscaot
080d810bc4 First Prototype of ChaosBauGUI 2021-02-02 23:44:46 +01:00
Chaoscaot
faf31bc883 Add 1.12 Support 2021-02-02 14:59:41 +01:00
Chaoscaot
7a89347248 Fixing and Editing 2021-02-01 15:06:22 +01:00
Chaoscaot
6376ef7dd5 Add Shift + Right Click Edit Sign 2021-02-01 13:42:19 +01:00
jojo
4f1307cc8d Fix pr stuff 2021-01-31 13:29:39 +01:00
jojo
440717f1f5 Add ShowModeParameter 'advanced' 2021-01-30 11:22:43 +01:00
jojo
a219bfc7b0 Simplify TNTSimulator 2021-01-28 10:40:33 +01:00
jojo
c7584cd952 Fix pr stuff 2021-01-27 15:26:06 +01:00
jojo
7f55dddd8f Add '-a' as alias for '-advanced' to ShowModeParameter parsing 2021-01-27 13:56:40 +01:00
jojo
1a72a39b33 Merge Basic ShowMode and Advanced ShowMode to EntityShowMode
Add EntityShowMode
2021-01-27 13:53:35 +01:00
0657f74d9d Merge pull request 'Add TraceGUI' (#161) from TraceGui into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-01-27 10:06:30 +01:00
jojo
7be5700359 Fix merge conflicts 2021-01-27 09:51:14 +01:00
jojo
200926d41d Fix merge conflicts 2021-01-27 09:50:41 +01:00
jojo
24e1541281 Merge branch 'master' into RegionSystem 2021-01-27 09:50:21 +01:00
jojo
28b818f799 Fix pr stuff 2021-01-26 15:22:53 +01:00
jojo
96be3d5259 Merge branch 'master' into TraceGui 2021-01-26 15:21:44 +01:00
jojo
d66c102c2e Fix CommandFreeze for entity spawning and redstone ore activation 2021-01-26 14:51:59 +01:00
jojo
41c5b3dd55 Rename GuiTraceShow inventory name 2021-01-26 12:06:01 +01:00
jojo
2d068abe32 Remove Redstone ore activation while freezed 2021-01-26 11:20:42 +01:00
jojo
fc275166cb Simplify math expressions 2021-01-26 10:58:12 +01:00
jojo
8bb76d656f Remove unused fields 2021-01-26 10:31:55 +01:00
jojo
55c5c3bda5 Remove unused fields 2021-01-26 10:25:36 +01:00
jojo
47e268fb54 Optimize Imports 2021-01-26 10:24:57 +01:00