SteamWar/BauSystem
Archiviert
13
0
Commit graph

350 Commits

Autor SHA1 Nachricht Datum
jojo
eeef18d504 Add /tpslimit Command 2020-11-15 13:12:52 +01:00
df44910ff5 Merge pull request 'Fix ConcurrentModificationException' (#112) from FixTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-11-15 12:05:11 +01:00
jojo
7a978a2f5b Fix ConcurrentModificationException 2020-11-15 11:53:10 +01:00
8d704e264c Merge pull request 'Fix Tracer Warning' (#111) from simplify-tracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-11-13 17:34:15 +01:00
jojo
585c4e6960 Fix Tracer Warning 2020-11-13 17:16:10 +01:00
9dd02f6c52 Merge pull request 'Improve Scoreboard (And tps rendering)' (#110) from improveScoreboard into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-11-09 06:22:40 +01:00
c3b59015fd Remove built in tps sensoring 2020-11-07 11:57:23 +01:00
90b3c7669b Improve Scoreboard (And tps rendering) 2020-11-07 11:53:15 +01:00
587a0fabc7 Merge pull request 'Fixing BlockData not in 1.12' (#108) from fixing-yoyo into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-10-29 08:35:10 +01:00
Chaoscaot
897a18d8b3 Fixing Yoyo Code 2020-10-28 21:42:43 +01:00
641a7bb6ec Hotfix WE problem 2020-10-27 15:27:29 +01:00
6600731321 Merge pull request 'Fix Autoloader load at Observer' (#107) from AutoLoaderFix into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-10-24 17:47:14 +02:00
jojo
6eb8d51dbd Fix Autoloader load at Lever
Fix Autoloader load at Noteblock
2020-10-24 17:31:52 +02:00
jojo
37caed14a3 Fix Autoloader load at Observer 2020-10-24 15:26:49 +02:00
81c653c836 Merge pull request 'Fix Scoreboard Nullpointer Erros with Trace Manager' (#105) from TraceManagerFix into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-10-02 18:23:37 +02:00
jojo
d9079a5010 Fix TraceManager.currentFrameSize 2020-10-02 18:06:36 +02:00
850d891bf6 Merge pull request 'Fixed CME' (#103) from detonator-fix into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-09-30 08:01:59 +02:00
Chaoscaot
156ee1c7b1 Fixed CME 2020-09-29 22:01:54 +02:00
d6fa5cf5e7 Merge pull request 'Fix UnsupportedOperationException on addAll()' (#102) from FixTracer into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-09-26 09:28:34 +02:00
jojo
2cc621f188 Fix UnsupportedOperationException on addAll() 2020-09-25 21:29:29 +02:00
e5d3712287 Merge pull request 'Fixed CCE When Block is Changed' (#101) from detonator2.0 into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-09-25 16:25:02 +02:00
Chaoscaot
9d02ce7862 Simplified Remove 2020-09-25 13:31:51 +02:00
Chaoscaot
19cf553654 Fixed CCE When Block is Changed 2020-09-24 22:40:32 +02:00
Chaoscaot
dbaba2fbcc Fixed CCE When Block is Changed 2020-09-24 22:38:27 +02:00
c2e4306577 Merge pull request 'Lazyly load owner to improve startup time' (#100) from lazy-loading into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-09-22 17:53:13 +02:00
d497ecf832 Lazyly load owner to improve startup time 2020-09-22 17:40:43 +02:00
2d9c6f76ec Merge pull request 'Fixed Lever Activation for 0 Ticks' (#98) from detonator2.0 into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-09-19 08:45:54 +02:00
Chaoscaot
4fd2638040 Fixed Lever Activation for 0 Ticks 2020-09-15 20:14:41 +02:00
f0169f0b59 Merge pull request 'Fixed Detonator CCE' (#97) from detonator2.0 into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-09-15 10:23:56 +02:00
Chaoscaot
0761b9105e Fixed Detonator CCE 2020-09-14 14:06:06 +02:00
1e337e3dcb Merge pull request 'Fixed Autloader' (#96) from detonator2.0 into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-09-13 20:05:48 +02:00
Chaoscaot
83c942764c Fixed Autloader 2020-09-13 19:57:48 +02:00
1e465d36a3 Merge pull request 'Reworked Detonator' (#95) from detonator2.0 into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-09-13 19:49:27 +02:00
Chaoscaot
c464cd9df0 Removed Unused Imports 2020-09-11 21:35:05 +02:00
Chaoscaot
6f8c3961a2 Finishing... 2020-09-11 21:32:32 +02:00
Chaoscaot
c27a548866 Added Function on Tripwire for 1.12 2020-09-09 22:45:28 +02:00
Chaoscaot
5ccf3ddf3c Removed Unused Stuff 2020-09-07 21:35:08 +02:00
Chaoscaot
24131e5bbe Reworked Detonator 2020-09-07 19:18:14 +02:00
d5a37350d6 Merge pull request 'move-copy-to-bausystem' (#94) from move-copy-to-bausystem into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-09-06 22:30:55 +02:00
f5c34db39e Refactor for "better" error handling 2020-09-06 21:05:39 +02:00
607ff10250 Move Copy-Schematic to BauSystem due to arena implications 2020-09-06 21:04:07 +02:00
f4a22fee47 Merge pull request 'Fernzünder' (#93) from detonater into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-09-06 14:34:18 +02:00
Chaoscaot
55e5b65345 Improved Language 2020-09-06 14:27:29 +02:00
Chaoscaot
ba2d321109 Added 12.2 Support 2020-09-06 14:01:30 +02:00
Chaoscaot
5952258956 Initial Detonator Commit 2020-09-06 01:52:19 +02:00
1f967fe998 Merge pull request 'Fix null pointer exception' (#92) from simplify-tracer into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-09-05 12:10:48 +02:00
jojo
63d787b2e4 Fix null pointer exception 2020-09-05 11:45:40 +02:00
jojo
1fba4511fa Fix null pointer exception 2020-09-05 10:50:08 +02:00
aa318d7d94 Adding AGPL header to tracer 2020-09-03 20:10:01 +02:00
2514b54e02 Merge branch 'prepare_open_source'
# Conflicts:
#	BauSystem_15/src/de/steamwar/bausystem/tracer/PlayerTraceCache_15.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/TracerUpdateManager.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/debugcallback/DebugCallbackActionBar.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/guicallback/GuiCallbackRecording.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/guicallback/GuiCallbackTNTFrame.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/guicallback/GuiCallbackTNTTrace.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/showcallback/TNTCallbackCacheUpdate.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/showcallback/TNTCallbackShow.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/updatecallback/TracerCallbackPositions.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/updatecallback/TracerCallbackTracing.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/updatecallback/TracerCallbackUpdatePoints.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/TNTListener.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/TNTTracer12.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/TNTTracer15.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/trace/ShowManager.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/trace/ShowStatus.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/trace/TNTFrame.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/trace/TNTTrace.java
2020-09-03 20:07:39 +02:00