13
0
Commit graph

171 Commits

Autor SHA1 Nachricht Datum
Chaoscaot
41ea0beaa4 Merge branch 'master' into nodes
# Conflicts:
#	SchematicSystem_Main/src/de/steamwar/schematicsystem/commands/GUI.java
2021-11-18 23:56:54 +01:00
Chaoscaot
8fe2a4f648 Add Copyright and Some Injectable Adjustments
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-11-18 23:56:16 +01:00
Chaoscaot
1918c96816 Add new Schem GUI and some Util Stuff
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-11-18 22:17:21 +01:00
Chaoscaot
0d10aedd81 Schem Load Message Fix
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-11-14 11:26:57 +01:00
Chaoscaot
4f8e527201 Soem New Things
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-11-14 11:23:52 +01:00
f71d732a47 Remove LEGACY items from list
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-20 17:28:23 +02:00
Chaoscaot
1ff74f7ab8 Add Schem Delete
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-10-11 11:36:14 +02:00
Chaoscaot
b59ff373b1 More Public
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-07-27 12:14:57 +02:00
Chaoscaot
7c300f366f Refactoring!!!11
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-07-27 11:56:42 +02:00
Chaoscaot
1758b4b9aa More [TM]
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-07-26 19:57:00 +02:00
Chaoscaot
d59dc62284 Some more refactor
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-07-25 20:15:49 +02:00
Chaoscaot
2f9cdff26d More Refactoring
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-07-25 18:50:31 +02:00
Chaoscaot
ad5e7f977b Imports 2021-07-13 15:47:56 +02:00
Chaoscaot
df2db0d63d Some new Implementations 2021-07-13 15:46:40 +02:00
5dcb083954 Merge pull request 'Implementing schematic preparation' (#92) from prepareSchem into master
Reviewed-on: #92
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-04-05 16:17:58 +02:00
eca811f3a4 Fix bugs
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-01 20:48:48 +02:00
3fadc8156b Implementing schematic preparation
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-01 20:33:30 +02:00
bb5f56b7f8 Merge pull request 'Requested allowed changes' (#73) from requestedChanges into master
Reviewed-on: #73
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-03-08 15:46:43 +01:00
e1fadadb58 Merge pull request 'Fix Schemlist Wrong DeclineReason' (#90) from schemlist-check-fix into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-22 11:52:08 +01:00
Chaoscaot
5662062b2c SchemList Fix 2021-02-20 19:50:38 +01:00
923fc5c062 Merge pull request 'Small cleanup refactoring' (#87) from cleanup into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-02-13 08:22:25 +01:00
6f728abf1c Further encapuling
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-02-04 10:32:27 +01:00
c916063734 Small cleanup refactoring
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-02-04 10:31:31 +01:00
8b020fe4df Fix message
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-01-24 14:50:18 +01:00
e579d60fc1 Merge pull request 'Removing' (#85) from schem-download into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-01-17 13:50:19 +01:00
Chaoscaot
335e7584cc Removing 2021-01-17 13:45:00 +01:00
7c9b6404e1 Merge pull request 'Fixing of SchemName' (#83) from schem-download into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-01-09 20:15:12 +01:00
Chaoscaot
befec0fc1b Fixing of SchemName 2021-01-09 20:13:34 +01:00
dfb45178f8 Merge pull request 'Fixing of SchemName' (#82) from schem-download into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-01-08 17:44:31 +01:00
Chaoscaot
4cca741e29 Fixing of SchemName 2021-01-08 17:34:21 +01:00
Chaoscaot
3cb522b0aa Fixing of SchemName 2021-01-08 17:14:47 +01:00
ffdeb81f24 Merge pull request 'Add Schemtransfer' (#81) from schem-download into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-01-08 14:39:23 +01:00
Chaoscaot
8fb3f8b066 Fixing of Big Schems 2021-01-08 14:07:17 +01:00
7056675fc7 Fix disclaimer
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-01-08 13:31:44 +01:00
0b0126b2b9 Nachrichtenanpassung
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-01-08 13:23:13 +01:00
Chaoscaot
2f8a2124d5 Fix java 8 2021-01-07 17:48:34 +01:00
Chaoscaot
5c02275b4e Add Schemdownload 2021-01-07 17:40:14 +01:00
jojo
bd679f0b0a Hotfix NPE 2021-01-05 13:37:47 +01:00
b74110a4ba Merge pull request 'Refactor version dependant calls to new System' (#79) from RefactoringVersionDependant into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-01-04 22:20:11 +01:00
jojo
e312fc8ced Refactor version dependant calls to new System 2021-01-04 22:05:42 +01:00
jojo
59a75a524d Refactor version dependant calls to new System 2021-01-04 22:05:16 +01:00
jojo
e155536573 Refactor version dependant calls to new System 2021-01-04 22:04:31 +01:00
jojo
d5cf3aa545 Refactor version dependant calls to new System 2021-01-04 22:03:22 +01:00
1dc6ddb2e8 Revert unneccessary fix
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-01-02 18:09:26 +01:00
4bf1905496 Fix Illegal argument exception
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-01-01 09:47:18 +01:00
93e1e13a8d Merge pull request 'Fix heads to utilise SWItem-API' (#76) from fix-heads into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-12-26 22:13:06 +01:00
e24c0296d0 Fix heads to utilise SWItem-API
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-12-26 22:04:45 +01:00
0c6b850100 Merge pull request 'Adapt SchematicSystem to new error handling' (#75) from new_error_handling into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-12-25 23:32:11 +01:00
82fe02b5f3 Adapt SchematicSystem to new error handling
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-12-25 23:28:16 +01:00
d1fee64909 Merge pull request 'Separate GUI from CLI' (#74) from separateGUI into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-12-25 23:03:18 +01:00