SteamWar/BauSystem
Archiviert
13
0
Commit graph

697 Commits

Autor SHA1 Nachricht Datum
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
0cab286774 Merge pull request 'Fix Freeze in 1.12' (#182) from FixFreeze into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-04 10:14:37 +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
88d1f7aa55 Merge pull request 'Simplify RegionSystem' (#181) from RegionSystem into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-03 21:17:39 +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
edb25635d4 Merge pull request 'Add plugin.yml' (#180) from AddAuthor into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-03 20:28:11 +01:00
jojo
607b1f1557 Fix plugin.yml 2021-02-03 20:27:16 +01:00
jojo
5f0477e920 Fix plugin.yml 2021-02-03 20:25:23 +01:00
jojo
9117b35a3a Merge branch 'master' into AddAuthor 2021-02-03 20:22:43 +01:00
jojo
78c0e72178 Add plugin.yml 2021-02-03 20:21:31 +01:00
8fee16d348 Merge pull request 'Editable Signs' (#175) from edit-signs into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-03 20:16:14 +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
e0d1847fe1 Merge pull request 'Fix freeze allow building of tnt' (#179) from FixFreeze into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-03 20:13:08 +01:00
jojo
7cb2f224a2 Fix freeze allow building of tnt 2021-02-03 20:07:40 +01:00
664e3a4cf9 Merge pull request 'Fix Sound of TNT ignite with freeze enabled' (#178) from FixFreeze into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-03 19:41:23 +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
c9d33d22b4 Merge pull request 'Fix CommandTNT for Region without Testblock' (#177) from FixWSGS into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-03 18:09:42 +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
f2ad417f75 Merge pull request 'Add Region section Support for /tnt /fire /freeze' (#168) from RegionSystem into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-03 15:45:30 +01:00
jojo
4648186c1a Fix pr stuff 2021-02-03 15:39:06 +01:00