SteamWar/BauSystem
Archiviert
13
0
Commit graph

905 Commits

Autor SHA1 Nachricht Datum
yoyosource
f585d81064 Add gradle build scripts 2021-04-11 00:44:31 +02:00
yoyosource
bdf5b9d808 Hotfix CommandProtect 2021-04-10 23:30:03 +02:00
f3b1d0a8b2 Merge pull request 'TestblockReset' (#247) from TestblockReset into master
Reviewed-on: #247
2021-04-10 20:40:56 +02:00
56c43e938b Merge branch 'master' into TestblockReset 2021-04-10 20:40:39 +02:00
yoyosource
51e9617ae1 Add CommandTestblock.genericTestblockCommand 2021-04-10 20:39:25 +02:00
yoyosource
fbb0cd3f4e Add CommandTestblock.genericTestblockCommand 2021-04-10 20:17:20 +02:00
63cce8aaeb Added debug out 2021-04-10 20:10:50 +02:00
yoyosource
7b3be4ae1e Add CommandTestblock.genericTestblockCommand 2021-04-10 19:57:56 +02:00
3cc10dfbb7 Merge pull request 'ProtectUpgrade' (#244) from ProtectUpgrade into master
Reviewed-on: #244
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-04-10 18:45:37 +02:00
9c382f66fa Merge branch 'master' into ProtectUpgrade 2021-04-10 18:41:04 +02:00
b3892b18f9 Merge pull request 'Add /tb extension or /tb normal to reset extension area as well' (#245) from TestblockReset into master
Reviewed-on: #245
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-04-10 18:40:25 +02:00
yoyosource
a6e32e08cf Simplify CommandProtect 2021-04-10 18:40:11 +02:00
yoyosource
9e899fe195 Add /tb extension or /tb normal to reset extension area as well 2021-04-09 22:30:25 +02:00
yoyosource
6453ec6616 Merge remote-tracking branch 'origin/ProtectUpgrade' into ProtectUpgrade 2021-04-09 20:36:42 +02:00
yoyosource
364267ae3c Update CommandProtect message sending
Add CommandInfo protect status
2021-04-09 20:36:34 +02:00
yoyosource
f3f3fb3625 Update CommandProtect message sending
Add CommandInfo protect status
2021-04-09 20:36:19 +02:00
1b681c3449 Merge branch 'master' into ProtectUpgrade 2021-04-09 20:00:21 +02:00
yoyosource
f95fb01eb1 Update CommandProtect message sending
Add CommandInfo protect status
2021-04-09 18:43:53 +02:00
yoyosource
bcc972ab6b Add BauScoreboard Protect section 2021-04-09 18:16:19 +02:00
yoyosource
4098d70a23 Add CommandProtect capabilities
Add Region.getProtectYLevel
2021-04-09 18:11:17 +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
010bac9741 Add initial CommandProtect usability 2021-04-09 16:51:52 +02:00
yoyosource
2353fb17e7 Add initial Region.protect 2021-04-09 16:24:47 +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