SteamWar/BauSystem
Archiviert
13
0
Commit graph

833 Commits

Autor SHA1 Nachricht Datum
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
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
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
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
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
e13335fb64 Merge pull request 'Fix Mapper' (#224) from TraceFix into master
Reviewed-on: #224
Reviewed-by: Zeanon <thezeanon@gmail.com>
2021-04-03 19:12:20 +02:00
yoyosource
667fa11a2b Fix Mapper 2021-04-03 19:10:33 +02:00
ae8521b85e Merge pull request 'Fix CommandTPSLimiter bug' (#223) from TPSStuffForAutoShutdown into master
Reviewed-on: #223
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-04-03 18:26:46 +02:00
yoyosource
20fa076176 Fix NPE 2021-04-03 18:26:18 +02:00
yoyosource
a10a60a0de Fix CommandTPSLimiter bug 2021-04-03 18:00:56 +02:00
yoyosource
3e3b790199 Hotfix CommandTNT 2021-04-03 12:03:04 +02:00
c4c7e53b63 Merge pull request 'RegionFix' (#222) from RegionFix into master
Reviewed-on: #222
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-04-03 11:55:01 +02:00
f072647b0c Merge branch 'master' into RegionFix 2021-04-03 11:46:53 +02:00
yoyosource
de6b20d827 Hotfix BauSystem RamUsage and AutoShutdown 2021-04-03 09:11:52 +02:00
yoyosource
ff1e5e06dd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
2021-04-03 09:10:57 +02:00
yoyosource
3cdff4c4b7 Hotfix BauSystem RamUsage and AutoShutdown 2021-04-03 09:10:04 +02:00
55435c7d18 Fix log messages 2021-04-03 08:47:07 +02:00
yoyosource
aa4058d5f9 Hotfix BauSystem RamUsage and AutoShutdown 2021-04-03 08:39:56 +02:00
yoyosource
829e3c64f0 Hotfix BauSystem RamUsage and AutoShutdown 2021-04-03 08:33:34 +02:00
yoyosource
08e0578fb4 Hotfix BauSystem RamUsage and AutoShutdown 2021-04-03 08:32:37 +02:00
yoyosource
fe6a40577c Hotfix BauSystem RamUsage and AutoShutdown 2021-04-03 08:29:52 +02:00
yoyosource
cd7890f5fe Hotfix BauSystem RamUsage and AutoShutdown 2021-04-03 08:26:09 +02:00
2131cc9423 fixed? ws-region-reset 2021-04-02 21:45:04 +02:00
8d6806b538 debug output 2021-04-02 21:23:23 +02:00
c4c785f9da debug output 2021-04-02 21:03:47 +02:00
yoyosource
d0372d86e9 Merge branch 'master' into RegionFix 2021-04-02 20:55:11 +02:00
3b8fc19436 Merge pull request 'Add shutdown of bau after five minutes no player' (#219) from BauOnline into master
Reviewed-on: #219
Reviewed-by: Zeanon <thezeanon@gmail.com>
2021-04-02 20:49:16 +02:00
9896c2e251 Merge branch 'master' into BauOnline 2021-04-02 20:45:36 +02:00
6eedf74f4b Merge pull request 'Add Regional Reset History' (#211) from reset_history into master
Reviewed-on: #211
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-04-02 20:45:16 +02:00
d378a90b9e Merge branch 'master' into BauOnline 2021-04-02 20:45:04 +02:00