SteamWar/BauSystem
Archiviert
13
0
Commit graph

705 Commits

Autor SHA1 Nachricht Datum
yoyosource
04319c8750 Revert "Revert "Merge branch 'gradle' into master""
This reverts commit 1157b4e7
2021-04-11 16:15:13 +02:00
1157b4e7a1 Revert "Merge branch 'gradle' into master"
This reverts commit d41f105264, reversing
changes made to db86661637.
2021-04-11 14:00:29 +02:00
d41f105264 Merge branch 'gradle' into master 2021-04-11 13:47:01 +02:00
yoyosource
db86661637 Hotfix CommandTestblock 2021-04-11 12:07:00 +02:00
yoyosource
a499ab09eb Fix RegionListener with Windows 2021-04-11 01:11:50 +02:00
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
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
7b3be4ae1e Add CommandTestblock.genericTestblockCommand 2021-04-10 19:57:56 +02:00
9c382f66fa Merge branch 'master' into ProtectUpgrade 2021-04-10 18:41:04 +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
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
yoyosource
f1e6006c51 Hotifx CommandProtect with Schematic 2021-04-09 16:02:14 +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
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
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
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
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
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
fa13ba264d Merge branch 'master' into Permissions 2021-04-04 18:16:02 +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