SteamWar/BauSystem
Archiviert
13
0
Commit graph

865 Commits

Autor SHA1 Nachricht Datum
yoyosource
4542ff608d Merge branch 'master' into RegionFix
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/world/Region.java
2021-04-05 13:13:23 +02:00
47c965619c Merge pull request 'ColorCustomization' (#238) from ColorCustomization into master
Reviewed-on: #238
Reviewed-by: Zeanon <thezeanon@gmail.com>
2021-04-05 13:11:48 +02:00
yoyosource
bc93d96787 Add Region persistence 2021-04-05 13:07:10 +02:00
yoyosource
7c075b18d4 Optimize imports in Region 2021-04-05 12:48:47 +02:00
yoyosource
6491e8a596 Optimize imports in Region 2021-04-05 12:46:29 +02:00
yoyosource
cdacf05871 Add CommandColor
Fix Region_15 region size
2021-04-05 12:32:36 +02:00
3e9a103018 added changeColor 2021-04-05 12:19:09 +02:00
e5c2fe20b0 Added CommandColor 2021-04-05 12:08:03 +02:00
yoyosource
e3880b3a30 Add Color
Add Region.colors
Add World config colors.json
2021-04-04 22:50:40 +02:00
yoyosource
cf9ebaa253 Fixup CommandRegion '/rg restore' 2021-04-04 21:51:19 +02:00
yoyosource
fb92b3526e Merge branch 'master' into RegionFix
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/commands/CommandRegion.java
#	BauSystem_Main/src/de/steamwar/bausystem/world/Region.java
2021-04-04 21:39:10 +02:00
8e7352ee7e Merge pull request 'Add '/rg restore' to restore broken blocks not self set ones' (#235) from RestoreCommand into master
Reviewed-on: #235
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-04-04 21:31:59 +02:00
yoyosource
738954f669 Add '/rg restore' to restore broken blocks not self set ones 2021-04-04 21:31:33 +02:00
yoyosource
fc7e502a16 Add '/rg restore' to restore broken blocks not self set ones 2021-04-04 21:20:51 +02:00
yoyosource
7e9f7139fd Remove Permission.build 2021-04-04 18:59:02 +02:00
yoyosource
dc4bbf3faa Merge branch 'master' into RegionFix
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/Permission.java
#	BauSystem_Main/src/de/steamwar/bausystem/commands/CommandDebugStick.java
#	BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGUI.java
#	BauSystem_Main/src/de/steamwar/bausystem/commands/CommandLoader.java
#	BauSystem_Main/src/de/steamwar/bausystem/commands/CommandRedstoneTester.java
#	BauSystem_Main/src/de/steamwar/bausystem/world/RedstoneListener.java
#	BauSystem_Main/src/de/steamwar/bausystem/world/RegionListener.java
#	BauSystem_Main/src/de/steamwar/bausystem/world/Welt.java
2021-04-04 18:55:29 +02:00
fe4094f2e6 Merge pull request 'Remove Permission.build' (#232) from Permissions into master
Reviewed-on: #232
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-04-04 18:52:09 +02:00
fa13ba264d Merge branch 'master' into Permissions 2021-04-04 18:16:02 +02:00
848152bf79 Merge pull request 'Fix ScriptListener ArrayIndesOutOfBoundsException' (#231) from ScriptFix into master
Reviewed-on: #231
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-04-04 18:05:32 +02:00
yoyosource
92b89775cf Remove Permission.build 2021-04-04 17:44:16 +02:00
yoyosource
cc90239971 Fix ScriptListener ArrayIndesOutOfBoundsException 2021-04-04 17:31:26 +02:00
de95eab04d Merge remote-tracking branch 'origin/RegionFix' into RegionFix 2021-04-03 22:50:21 +02:00
a55499d031 hopefully fixed region points 2021-04-03 22:50:14 +02:00
yoyosource
049e18cfd2 Merge remote-tracking branch 'origin/RegionFix' into RegionFix 2021-04-03 22:40:30 +02:00
yoyosource
d282485255 Change Success message 2021-04-03 22:40:24 +02:00
0a821936c6 updated because Yoyo renamed methods 2021-04-03 22:39:49 +02:00
yoyosource
ab7471a028 Update Formatting 2021-04-03 22:36:23 +02:00
yoyosource
840016ec44 Add CommandSelect.instance 2021-04-03 22:33:38 +02:00
yoyosource
b23c112a7d Finish CommandSelect 2021-04-03 22:25:57 +02:00
00b350be63 updated because Yoyo renamed methods 2021-04-03 22:17:42 +02:00
189c166383 Merge remote-tracking branch 'origin/RegionFix' into RegionFix 2021-04-03 22:16:26 +02:00
db3e3a7cbc converted enums to upper case
added CommandSelect
2021-04-03 22:16:19 +02:00
yoyosource
61c7a5c7a6 Fix Region.hasExtensionArea 2021-04-03 22:16:09 +02:00
c3c5800b03 Merge pull request 'Add ItemFrameListener' (#226) from ItemFrame into master
Reviewed-on: #226
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-04-03 21:55:11 +02:00
df54247fcc Merge branch 'master' into ItemFrame 2021-04-03 21:54:50 +02:00
yoyosource
7eb8a4b53b Fix ItemFrameListener with Item in ItemFrame 2021-04-03 21:53:25 +02:00
yoyosource
ca13e3236c Fix ItemFrameListener with Item in ItemFrame 2021-04-03 21:47:58 +02:00
fa790a8489 Merge pull request 'Fix TNTSimulatorListener on 1.12' (#227) from SimulatorFix into master
Reviewed-on: #227
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-04-03 21:42:41 +02:00
5ec9f272b8 Merge branch 'master' into SimulatorFix 2021-04-03 21:42:30 +02:00
faba85d338 Merge pull request 'Boost CommandTPSLimiter to 60' (#228) from TPSLimit into master
Reviewed-on: #228
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-04-03 21:29:32 +02:00
yoyosource
d5f194656b Fix RegionType.BUILD 2021-04-03 21:28:34 +02:00
yoyosource
12bd4718d2 Boost CommandTPSLimiter to 60 2021-04-03 21:21:57 +02:00
59a326ebca Merge branch 'master' into SimulatorFix 2021-04-03 21:05:43 +02:00
yoyosource
2ea6c27d05 Fix TNTSimulatorListener on 1.12 2021-04-03 21:05:23 +02:00
83cb79aaee Merge branch 'master' into ItemFrame 2021-04-03 20:54:53 +02:00
yoyosource
63b34175fe Add ItemFrameListener 2021-04-03 20:54:28 +02:00
yoyosource
e90dda786b Update to new Code style 2021-04-03 20:28:29 +02:00
yoyosource
bdc9e44e2a Make Region System more readable by splitting a long class file 2021-04-03 19:49:36 +02:00
yoyosource
255c7e8355 Update Region to new Region.RegionType and Region.RegionExtensionType 2021-04-03 19:40:47 +02:00
yoyosource
e75da0d8f4 Add Region.RegionExtensionType
Add Region.RegionType
2021-04-03 19:35:37 +02:00