aboutsummaryrefslogtreecommitdiff
path: root/src/main
AgeCommit message (Collapse)Author
2019-12-15changed prio to prefer newer elements if two have the same priobartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: ff122c58d8ad633486463d56b61c506c1200f62a
2019-12-15Renamed SSList -> AccessPriorityListbartimaeusnek
+ implemented clear() Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 56a7fd3f407454fb1eee55ec8e02a255267fbce8
2019-12-15Fixed SSList Iteratorsbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: ac9f5e451758b0e50ae33e6fc02985f77d4e4596
2019-12-14Quickfixbartimaeusnek
+ fixed possible NPE Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 429e31fa1436be9a3dafb32c1e061fbeb01bb1a0
2019-12-14Added Morons "Ademic Steel",bartimaeusnek
+ fixed additional oredict for oredict enforcer + added a config option to disable the crafting patch + made setters for overrides chainable (Werkstoff.Stats) + version increace Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: ba3570045ef6d4f29a51d6db16f5c57b4414e981
2019-12-14modified sorting algorythm to skip multiple nodesbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: f48a59b9257759308ea7406a457d90adc40f4b02
2019-12-14added Self Sorting Listbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 60b2b9cdd5a015030c879bc1b06bb3f3bf8abeaf
2019-12-13removed index of callbartimaeusnek
+ by using an iterator instead of functional call Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 9ff73dc8b87c91fc8cf41c63f6d8a4664af7d68e
2019-12-13added ASM to buffer recipebartimaeusnek
+added a command to print the recipe list to a file Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 2d9d7406dc7377641cfcf6d38e744e89c7518a47
2019-12-11added fully automated Werkstoff Blocksbartimaeusnek
+ added recipes for the blocks + version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: dec9f6907e8c91cff240f6a9141c3531ceccea62
2019-12-09added additional OreDictbartimaeusnek
+ fixed issues with Thaumcraft Aspect Handler if Forestry isnt installed + refined error handling + removed redundant calls that have a function + version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: eaa39a4359ee177307eaf954bdbe4032465ecb51
2019-12-09fixed problems with vanilla gt5ubartimaeusnek
+ inlined an else statement Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: f46f6f19f8a44f45b582c2cbe7802d06df6c471a
2019-12-09Updated Copyrightbartimaeusnek
+fixed or suppressed all warnings Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 72b19b4f3b8c4c2151559f06dc7455a045d7f28b
2019-12-09Updated Copyrightbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: eea59a9e5c0ad3f66137668fdd3defd3a7ddb27b
2019-12-08Smaller fixesbartimaeusnek
+ added a recipe for Th232 + enforced Zr unification + added a quality override for ToolQuality + used getters for speed, dur, and quality Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: bca918b0f7e147511705d8c2051e18072250cf5e
2019-12-08Fixed Numbers in Loaderbartimaeusnek
+ fixed Werkstoff Mixer recipes not generating + fixed insaine high voltage, and insaine short time requirements for FluidExtractionRecipe and FluidSolidifierRecipe + fixed ElectrolyzerRecipes, CentrifugeRecipes, ChemicalRecipes, MultiblockChemicalRecipes, MixerRecipes time + added not yet enabled TT integrated ManualTrafo Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 0e0b878ded7e1780bb71004cd6cb76016ca562e6
2019-12-06WerkstoffLoaderAPI fixesbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 953e1f8f195691105e3bcefedc3f34fb101ac71d
2019-12-06WerkstoffLoaderAPI fixesbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: c95af8174bf3e49b23c31e0fa984b669ac50274d
2019-12-06code maintenancebartimaeusnek
+ completely disabled GT++ ASM due to the wish of the author + repaired Unification Enforcer for items + general readability fixes + WerkstoffLoaderAPI fixes Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: b02ed0bee600695b3be09abd8ce59552676289ce
2019-11-14moved recipes editbartimaeusnek
+to fix CircuitAssembler Recipes +might break scripts Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 9a7dd8ebf5574611e275aef1ca3e4e3cd10e8823
2019-11-09added SmallOres fortunebartimaeusnek
+modified NEI handler Signed-off-by: bartimaeusnek <lokko12@web.de> Former-commit-id: 67fa75d497e38016116b612f34b378f4578ec338
2019-11-03fixesbartimaeusnek
+fixed small ore names +fixed Hg-Compound Werkstoffs not giving out Hg +fixed cell amount in a recipe Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: db1b903fe9f5b93a1abc381791fe7d8bd0760f6d
2019-11-03fixed small oresbartimaeusnek
+fixed small ore names +added registration for small ores +changed some tooltips +added mercury minerals to use with GaGreg Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: ee0f8301e2040459d922690b505d0760946383a2
2019-11-02added small oresbartimaeusnek
+fixed heated water pump Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: f2655dba9dabfb9a2fc58ec8e11c96fff5dcad5b
2019-11-01Fixed Unification Enforcerbartimaeusnek
+retiered YttriumOxide and CubicZirconia to HV due to Kekztech Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 24a492183a74f63c1cd0eade615488c166f4fd39
2019-10-31fixesbartimaeusnek
+fixed some recipes +fixed structure check for Circuit assembly line +added Formic acid to the acid gen +re-blacklisted planet stone dust for platinum overhaul Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 5db7bb137eb62c157546e97c78cf00779107e4c4
2019-10-29fixesbartimaeusnek
+ removed final field stuff due to a "java.lang.NoSuchMethodError" on server + fixed last remaining Platinum reverse recipes for Dreamcraft/GT Items + fixed a typo in the centrifuge recipe + added a circuit priorisation mode for the MEGA EBF + redid the CircuitAssemblyLine Structure-Check + version increase to match testing version Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 7037b78d15f87115e9064f712aaacd523d9784d6
2019-10-20fusion fixbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: f35ece6e934deb7d989f26cd4f1046311ad4492a
2019-10-15Fixesbartimaeusnek
+fixed circuit assembly line +changed THTR, now requires up to 0.5% of input per cycle +added saftey-nullchecks to BioLab +buffed Ross128ba Helium and Saltwater +added General purpose Fermenting Bacteria & fermentation recipes to the Bio Vat +version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: f5d0470ab8375536e9e880918390b54d658139ed
2019-10-13fixed BioCulture "breeding" Systembartimaeusnek
+improved readability +rebalanced Rhodium (zinc loss removed, 0,8 -> 0,2 Rh per Pt) +optimised imports Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 2f58c0c6bba54adba05b82685e8fea830e3df468
2019-10-11+increased buildnumberbartimaeusnek
+added a bit on tectech compat Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 69f8fe52c9ec7b94a138db426f3c65496792d22b
2019-10-11added TecTech handlerbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 9d40a13aa3cef2a1e87521147628fa2487a2e13c
2019-10-11Sifter Bug fixbartimaeusnek
+added an ASM line to disable the 12% bonus on the GT++ Sifter +removed unused ASM Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: e72b36764a4417b3393eb06cc7ca310a0d623e3a
2019-10-10fixesbartimaeusnek
+added ASM fix for RWG +fixed conversion recipes if GT++ isnt installed +fixed texture loader +added mega distillation tower +made Circuit Assembly Line needs power +added heat level 9 for MamiTomoe +added capsules/fixed capsules +started working on bottles +started working on dyson swarm +added The Core picture +added bottle pngs +version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 59da6d7f671e9af160b45b0b9a3021048dbaaa9d
2019-09-29added Localisation for a few more fluidsbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 968a052970b71ea7081e627e384bc4b02b8b7400
2019-09-29fixesbartimaeusnek
+General fix for Recipes that use Tier Voltage instead of Machine Voltage +limit stack sizes for CAL to max stacksize instead of 64 to make recipes doable Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: f7ac5f2b64c8f406a7a15f3eeb016f08f48435c7
2019-09-28+added localisation to BioCulture System(add your locale to the GT Language ↵bartimaeusnek
File) (fixes #38) +removed dead AE2 code +applied new prefix logic to the thaum compat +added most of GT Tools and some Electric GT Tools +greatly improved bridge materials +fixed some platinum stuff not giving back the correct dusts +fixed formic acid input loss +moved code in the propper packages Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: cd295221dc66e27a72cddc900e70535ea81c5d54
2019-09-25fixesbartimaeusnek
- cells getting deleted after use on drums - higher tier fluid solodifier uncraftable Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 4cadf71307543fb8923a698dc6c8195ccb71100a
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