SteamWar/BauSystem
Archiviert
13
0
Commit graph

884 Commits

Autor SHA1 Nachricht Datum
yoyosource
2120559bfa Initial CommandAutostartTimer 2021-04-10 10:10:39 +02:00
e45c2fa772 Merge pull request 'Add rotate of schematic if pasted as testblock, when check type or fight type' (#242) from SchemRotatability into master
Reviewed-on: #242
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-04-09 17:50:07 +02:00
68d1ba9d4e Merge branch 'master' into SchemRotatability 2021-04-09 17:43:55 +02:00
yoyosource
140513fee3 Add rotate of schematic if pasted as testblock, when check type or fight type 2021-04-09 16:18:57 +02:00
77c69923b5 Merge pull request 'Fix Region_15.changeColor' (#241) from FixTestblock into master
Reviewed-on: #241
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-04-09 16:07:39 +02:00
7f14d43f50 Merge branch 'master' into FixTestblock 2021-04-09 16:05:27 +02:00
yoyosource
f1e6006c51 Hotifx CommandProtect with Schematic 2021-04-09 16:02:14 +02:00
yoyosource
b9aa99b52c Fix Region_15.changeColor 2021-04-09 15:44:54 +02:00
yoyosource
8c190bf88b Hotfix CommandRegion help 2021-04-05 17:24:17 +02:00
yoyosource
fe458d185c Hotfix CommandSelect for 1.12 2021-04-05 17:19:58 +02:00
20863abd99 Merge pull request 'RegionFix' (#240) from RegionFix into master
Reviewed-on: #240
Reviewed-by: Zeanon <thezeanon@gmail.com>
2021-04-05 16:57:56 +02:00
yoyosource
41e0eacd58 Fix one ofs in Region_15 2021-04-05 16:40:05 +02:00
yoyosource
8aecdf71a5 Fix help mnessage CommandRegion 2021-04-05 15:34:22 +02:00
yoyosource
9583ea7138 Merge branch 'master' into RegionFix
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/commands/CommandColor.java
#	BauSystem_Main/src/de/steamwar/bausystem/commands/CommandRegion.java
2021-04-05 14:55:02 +02:00
4f06773ac4 Merge pull request 'added rg color command' (#239) from ColorCustomization into master
Reviewed-on: #239
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-04-05 14:41:58 +02:00
28fb4bc6ab added rg color command 2021-04-05 14:40:34 +02:00
yoyosource
5bf771c1ce Add save/load GlobalRegion options 2021-04-05 14:31:47 +02:00
yoyosource
fcf8f2790b Hotfix CommandColor 2021-04-05 13:22:36 +02:00
yoyosource
485efedcfc Fix CommandColor 2021-04-05 13:21:57 +02:00
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