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 |
|
|
|
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 |
|
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 |
|
|
|
9a251af3f0
|
Merge pull request 'Fix tnt spawning on redstone sources' (#176) from TNTIgnite into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-02-03 13:41:44 +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 |
|
|
|
d4464fb009
|
Merge pull request 'TraceModes' (#174) from TraceModes into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-01-30 13:49:42 +01:00 |
|
jojo
|
440717f1f5
|
Add ShowModeParameter 'advanced'
|
2021-01-30 11:22:43 +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 |
|
|
|
e8e574369b
|
Merge pull request 'Fix CommandFreeze for entity spawning and redstone ore activation' (#170) from FreezeBug into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-01-27 09:49:00 +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 |
|
