SteamWar/BauSystem
Archiviert
13
0
Commit graph

272 Commits

Autor SHA1 Nachricht Datum
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
b800c3f197 Merge pull request 'Simplify Tracer' (#91) from simplify-tracer into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-08-30 13:20:39 +02:00
5e539a8756 Untangle spagetti code #3 (might not work in this state) 2020-08-30 12:01:47 +02:00
jojo
4aaf9d0c3e Fix CommandTrace 2020-08-30 10:51:42 +02:00
dda4ad7f99 Untangle spagetti code #2 2020-08-30 08:01:51 +02:00
6831ada70f Untangle spagetti code part 1 2020-08-30 07:45:32 +02:00
1f2b6a0290 Simplify Tracer #1 2020-08-30 07:13:11 +02:00
jojo
a581beee5c Fix Tracer dirty Optimization 2020-08-30 03:10:45 +02:00
jojo
0b13700a3a Fix Tracer maxSize Optimization 2020-08-30 03:06:22 +02:00
jojo
6745dfe3c1 Fix Tracer actionBar 2020-08-30 02:57:48 +02:00
jojo
daa6979e5a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
2020-08-30 02:47:01 +02:00
jojo
e62f371578 Merge branch 'TNTTracer' 2020-08-30 02:44:52 +02:00
jojo
0bf5653eea Fix Tracer 2020-08-30 02:42:24 +02:00
jojo
b13dcc57a1 Update Tracer 2020-08-30 02:23:23 +02:00
d075664abb Merge pull request 'Fix Loader Redstone' (#89) from loaderfix into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-08-29 11:33:04 +02:00
Chaoscaot
7b3fcf90b1 Removed Offset Array 2020-08-29 11:19:42 +02:00
Chaoscaot
4a5e8c3d66 Reduced Number of Updated Blocks 2020-08-29 11:18:49 +02:00
a933da7c30 Getting next block 2020-08-29 11:02:01 +02:00
Chaoscaot
bb814a2103 Improved Location Selection 2020-08-29 10:27:32 +02:00
Chaoscaot
88a495f4ae Fixed Sign Text Disappearing if Next to a Button pressed by Auto Loader 2020-08-29 09:30:29 +02:00
Chaoscaot
6afaeebfae Fixed Autoloader 15 Redstone under Block 2020-08-29 09:12:09 +02:00
Chaoscaot
d4535ff36d Fix Loader Redstone 2020-08-29 01:15:19 +02:00
143735809c Prepare open source release 2020-08-26 18:48:57 +02:00
e18b2c77d8 Remove unnecessary error message 2020-08-15 17:16:41 +02:00
81182f5b6f Fix 1.12 reduced debug info 2020-07-27 06:53:08 +02:00
6b682e666e Fix ReducedDebugInfo 2020-07-26 23:00:03 +02:00
2858f87e5d Fix DebugInfo 2020-07-26 22:57:07 +02:00
72a2b4821d Fix ReducedDebugInfo 2020-07-26 22:55:39 +02:00
9d56f09624 Fix ReducedDebugInfo false 2020-07-26 22:52:48 +02:00