aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
AgeCommit message (Collapse)Author
2019-09-21security patchesbartimaeusnek
+moved some commands, +fixed a typo +removed null items +rebalanced TheCore +added forestry compat (possible due to their LGPL license!) +fixed langfiles Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: cf1373fd88ba341662144023f989bc45fef3c48d
2019-09-19added Ross128ba into the gamebartimaeusnek
+fixed ore decolorisation +added "TheCore" Nq cell +rewrote NEI Ore Handler +limited oregen to the propper planets +added Fluorspar ore +further improved werkstoff recipe generation +a lot of smaller fixes and balance Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: aaed052c041488605313bd133e66a575451a2a9e
2019-09-14fixesbartimaeusnek
+added a warning to not disable Ross after world start +fixed a lot of broken recipes +further fixed bridge materials/OreDict +added Tiberium FuelRods +fixed lenses not showing up +fixed gem only materials +added NoBlast SubTag Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 4ede8aeef53134b181aba6b15c5e372eda4ef9ea
2019-09-11fixed the recipe replacerbartimaeusnek
+changed out Osmiridium for LuV recipes +added Tiberium for Blackflame +added LuVFineWireMaterial("Ruridit") +added wireFine items & recipes +fixed Scanner/Replicator recipes +deleted an unused class +added a config option to silence the GT++ logging Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: a0981899093b854814d4c04c9c321b9a4df17e5f
2019-09-10rebalanced PTGroupbartimaeusnek
+improved imports +fixed UnificationEnforcer Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: a74d38b748c8bac947a40e8fe94c1d93362dbcf8
2019-09-09rebalanced PlatinumStuffbartimaeusnek
+fixed some recipes Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: b911c3a4b8b6a94cbd6f40b4d7ad4619b02dce72
2019-09-08fixed bugsbartimaeusnek
+added crafting meta items +added multiple ingot neta items +fixed LuV Tier recipe changer +smaller visual fixes +smaller recipe fixes Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: d6e740bf94c3c1d79aa9b3368cf84ae32fafce64
2019-09-07lot of fixesbartimaeusnek
+fixed translation for asembly line machines +fixed UnificationEnforcer +made diode recipes use new LuV Material +use my own prefixLogic +fixed my prefixLogic +added plate, stick and stickLong to my Werkstoffs +made LuV Hulls/LuV Casings use my LuV Material +fixed wrong outputs of nerfed dusts +fixed crop recipes give out pure metal +fixed crafting recipes give out pure metal +added Sodiumformate recipe Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 88e0e27dc697559c7ea2b455a557f3dfa5f807b8
2019-09-07recipe changesbartimaeusnek
+added fluid container registration for LCR +fixed boxinator(packager) recipes +rebalanced PGSD Overhaul v1 +fixed typos +added HotIngots +started on own logic system for oreprefixes Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: a1fb14768be881f1fa6324bf66a685f32bd14803
2019-09-06fixed weird behavior of autogenerated recipesbartimaeusnek
added Ruthenium, Iridium, Osmium and Rhodium chain Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: ea0d26a9cceed1004f6eb2c6c2f3779faabc0505
2019-09-05began on PlatinumOverhaulbartimaeusnek
Palladium and Platinum recipes are done Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: b7cbc2e2b799c3bc2a2e6ef31395d14bda5f6ef0
2019-09-04changed load order again, fixing class exceptions in obfs enviromentbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: bb79d62b33144ce4b36289d05bea2bbbff972732
2019-09-03final 5.1 commitbartimaeusnek
-changed Loading behavior -added oredict for glassblocks -fixed crash when galacticraft.planets is not installed, but only galacticraft.core -started to work on 5.2 content,loading of which is disabled Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: b3f46ee3a6870d9ae9c35a725fe69f6bebae07ca
2019-09-02Moar Fixesbartimaeusnek
+THTR now puts out the correct amount of IC2HotCoolant +improvements on the Unification Enforcer (added a way to convert old fluids) +fixed original EBF noble gas recipe to not be affected by lower tier gas +rebalanced ZPM+ Circuits +added new Textures by EmeraldsEmerald Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 7cb480259f0cc023c04bc55a58785649b242cf8f
2019-08-30removed unused imports,bartimaeusnek
+version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 31bcdc7dedf59e1a8ed0cac710a9504c172a0910
2019-08-30fixed circuits, and missing recipes for EBFbartimaeusnek
+added stuff to debug log +code inprovement Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 273819d206f4a409c6f76c97e84e05a2029c8ad7
2019-08-28Several fixes, last planned pre 0.5 releasebartimaeusnek
+worked on Ross128bA +added config option for magical forrests on Ross128b +fixed non working Werkstoff recipes +added config options for CAL +added config option for new EBF Gas recipes +added pictures for circuits (thanks EmeraldsEmerald) -fixed CAL recipe Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 70c7fc511c2ddacd908831e9d4501708bc23c332
2019-08-22some fixedbartimaeusnek
-fixed circuit assembly line not crafting -fixed some NEI/Circuit Assembly Line issues Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 7c15b789303c7673c351743e4885cb1abd9145d1
2019-08-20added recipe for CircuitAssemblyLinebartimaeusnek
+fixed unificationEnforcer for GT++ "molten."noblegases +added localisation for CircuitAssemblyLine achivment +added Capacity description to the GiantOutputHatch +added Xenon to the Liquid Air Distilling recipe Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: fbea0279363b61a810ea5b11d5b5535503fb310f
2019-08-19added Noble Gassesbartimaeusnek
+fixed fluid generation system +fixed UnificationEnforcer +added MoltenCells +added NobleGas EBF Recipes +added Replicator/Scanner Recipes +started working on Giant Hatches Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 8a5a261297188387671ce994e3cc02f81eedb7ff
2019-08-17fixed CircuitAssemblyLinebartimaeusnek
+added Gas +started on fluid generation +started on forced re-unification +worked on TileEntity_GTDataServer Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: c9328571559451e83d31e56d17cdb07fd9e5e008
2019-08-15added pngs to circuit assembly line partsbartimaeusnek
+fixed part recipes +hide trash from nei Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 28aa41372e52886f7f8ce08e8452fabc440ebb14
2019-08-13fixed MP issuesbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: bd9898031da9580de00cdc928bf90af882fe9c58
2019-08-11Circuit Assembly Line addedbartimaeusnek
+ added "classic mode" Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 6d0acc949506b6fcd424f971c39f0b8e3a75093b
2019-08-06+added Achivment Localisationbartimaeusnek
+MegaMachine Fixes Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 4e539963efb6cbe8603466dea2e7850aab6e4bec
2019-08-01finalised circuit recipe genbartimaeusnek
+fixed lowgravity/cleanroom mismatch +fixed name of "Magneto Resonatic Dust" +fixed Electric implosion generator not working Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 2ebdf8661cc9db030a355b8d7570cb8539be0cc2
2019-07-31improved circuit recipe generationbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 915e3e018f1b929bdd5ca03cbb668a85ade12e02
2019-07-300.5pre Circuitsbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: aeccff4e60af64a4f1a140019ca3989bd3de87c6
2019-07-19added config changing commandbartimaeusnek
+made the bio vat bonus config dependant +version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 40c59e4af03241615320fa70be0a6ac3ce08de95
2019-07-18finally fixed the stupid modifierbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 9b1e63e27c1beb65b909b5434e50db0903e5e84f
2019-07-18version increasebartimaeusnek
+readded missing imports Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 7908a75ed61f98e41cf66124699c3d4860537900
2019-07-18code maintenancebartimaeusnek
+cleaned up code (removed unused imports, resorted modifiers, added qualifiers) +fixed BioVat bonus? maybe? +fixed BioVat Forming issues with invisible TEs inside Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 2b19f3694c04f39845f0b55fb0e012cf1dc265e7
2019-07-17New BioVatOilRecipebartimaeusnek
+fixed bugged modifier on the BioVat +added OilRecipe Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: a4f4a2eab37f14377a770ae8e7068e90cc207187
2019-07-16version increase, codestyle fixesbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 18023016c0c5e6c11babbc64de516f8c5ca561e0
2019-07-16added GT++ Localisationbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 34ab3a274facd5295857fb1671da538630ccf733
2019-07-16added GT++ compat, fixed bugs, improved codebartimaeusnek
+added qualifiers to a lot of stuff, +wrote a GT++ compat for the radio hatch +fixed a typo in he bacterial vat description +made the bio vat loose his output when sv arent delivered though the whole process +hopefully fixed the stackoverflow for ores +buffed output on siftable ores +made my werkstoffsystem work with the biovat Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 1f414f3ebc7b214f85c89e1cd597910d4dfec2f1
2019-07-12fixesbartimaeusnek
+added sub/supercript numbers to Werkstoff +adjusted ElectricImplosionCompressor times +added "Creative Debug Scanner" for BlackFlame +added ingot/nuggets to Werkstoff +improved Generation Randomness of Ruins +fixed MegaEBF forming issues +added an Interface for the Radiation Hatch +minor API changes +added Tellurium Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: ea498532b67021650b60b739c10ae7bc120ba22a
2019-06-03fixed DEHP recipebartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: f33e956d64f45ddac25a7570fa23cdb954ca6864
2019-06-02Added config optionsbartimaeusnek
-removed broken IC2 recipes Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 430abd84eab9bd6ec4f0cfc1c376c8afa81fb7f5
2019-05-27fixed 45% empty spacebartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 7be7d38b1d9160b2c4ee9411259bf3b04d582b1e
2019-05-25fixed thorianit exploitbartimaeusnek
+fixed yttrium oxide recipe +added thorium leaf recipe Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 1a76d7dcfa80617e9be58f914e3aeb01ba223e83
2019-05-13added Miner Compabilitybartimaeusnek
+tweaked heat values for GTNH +minor code changes Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 4f6fba852c442166ad52d3a8886d0fa825d7c667
2019-05-04added ConfigOption for TC patchbartimaeusnek
+added DeObfs instruction +code cleanup Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: d28147d803a8f97cf0d8ef07870f4e28691d7212
2019-05-04Merge branch 'master' of https://github.com/bartimaeusnek/bartworksbartimaeusnek
Former-commit-id: 5aef62df50970df335776ccf098a30a4f919459a
2019-05-04smaller fixesbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 9ae4a938c305f96c15859edccb5b69baacc6599d
2019-05-04Add thaumcraft wand pedestal fixFabian Maurer
We only add the vis into the wand on the server, preventing vis duplication in SP. Former-commit-id: a426a31acbe75d3a2188ab7d9b82b45f9c5c75c8
2019-04-28Tooltip Server Synchronisationbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 1ce6237155c71ee8329f6302c82b357cc6432214
2019-04-28re-enabled the tooltip handlerbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 949b0d20ef0323d6308beac55e46a933b32bcf79
2019-04-28reworked clienteventhandlerbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: be5ebbabc9ed6e24d8394f4f38242c431b9f694e
2019-04-23improved threaded loaderbartimaeusnek
+fixes not enabled ASM code Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: c7b407a7fed7730839a2613a93b5a985e7ae3a0e