Age | Commit message (Collapse) | Author |
|
* Remove reference to GTPP_Recipe itself
* Remove GTPP_Recipe_Map_Internal
* Move recipemaps to separated class
* Remove unused recipemaps
* Migrate GT++ recipemaps
Remove sElementalDuplicatorRecipes in favor of GT replicatorRecipes supporting findRecipe
* Migrate the rest
* Adjust catalyst priorities
* Add ABS non-alloy recipe category
* Remove s prefixes from recipemaps
* Adapt to GT_StreamUtil rename
* Adjust recipe catalysts
* Fix build
* update gradle+bs+deps
(cherry picked from commit 8b185c7a4d881d38580cc98456265ebb751b6d93)
* update deps
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
* Kill playerAPI
* Gut more events and compat that is now obsolete
* Remove commented out code
* Remove final modifier from methods
* Make more stuff final
* Remove slow building ring
* Protected -> private in final classes
* More cleaning
* More cleaning v2
* Purging
* Clean DevHelper
* Clean DevHelper 2
* delete DevHelper
* remove useless IFMLLoadingPlugin.MCVersion annotation from @Mod files
* check for obfuscation only once in the IFMLloadingPlugin.injectData
* don't instantiate the static class ASMConfig
* delete unused and empty implementation of IFMLCallHook
* delete empty class
* delete ClassesToTransform class that just holds the class names constants
* delete unused methods and unsless logging in dummymod container
* delete unused transformer ClassTransformer_TT_ThaumicRestorer
* spotless
* Clean
* Clean utils
* Build checkpoint
* Purge
* Stage 2
* Stage 3
* Stage 4
* Stage 5
* Stage 6
* Spotless
* Imports
* Stage idk
* Stage 1
* Fix issue
* Spotless
* Format numbers
---------
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com>
Co-authored-by: Connor Colenso <colen@CONNORSPC>
|
|
|
|
* Fix LFTR powergen without fuel
- Override "process" from ProcessingLogic to execute the new "resetMultiProcessing" method before returning NO_Recipe;
- Add new "resetMultiProcessing" method to reset EU/t value, progress, recipe and shut down the LFTR when inputs aren't enough.
* Fix Sparge Tower OC and 10x speed bonus
- Changed voltage calculation to actually allow overclocking with 2 energy hatches, which the Sparge Tower already accepted;
- Removed the 10x speed bonus the multi had for seemingly no reason, and reduced recipe time by 10x, from 250s to 25s, on all of its recipes to compensate.
* Fix Sparge Tower energy handling
- Set lEUt to negative to properly consume energy, since the old logic used a positive lEUt value, which corresponds to EU generation, not consumption.
* Tweaked Fuel Refinery required hatches
- Removed the Output Bus requirement, as there are no item outputs in this recipe map;
- Changed the fluid hatch count to minimum 2 input and 1 output, which is enough for Refinery recipes. Left the maximum at the previous 4 input and 2 output, to keep existing structures working and for setups that produce two fuels per Refinery.
* Downscaled longest Refinery recipes
- Changed the two very long Refinery recipes, so that fluid amounts are 10x lower in input and output, alongside a 10x smaller duration, to make them more manageable, and less punishing if the multi voids for some reason.
* Apply spotless
* Requested fixes
* spotlessApply (#720)
Co-authored-by: GitHub GTNH Actions <>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
|
|
|
* Migrated extruder
* Migrated alloy smelter
* Migrated arc furnace
* Migrated centrifuge
* Migrated ICO
* Migrated cutter
* Migrated dehydrator
* Migrated electrolyzer
* Migrated fluid heater
* Migrated forge hammer
* Forgot gtpp machines are cursed
* Migrated mac
* Migrated mixer
* Migrated molecular transformer
* Migrated bender
* Migrated sifter
* Migrated thermal centrifuge
* Migrated VF
* Migrated washer
* Migrated wiremill
* Migrated Volcanus
* Migrated adv implo compressor
* Migrated XL turbines
* Migrated chemplant
* Migrated MABS
* Migrated ABS
* Migrated cyclotron
* Migrated Zhuhai
* Migrated rock breaker
* Migrated rocketdyne
* Migrated semifluid generator
* Migrated QFT
* Minor optimization
* Migrate refinery
* Migrated solar tower
* Migrated TGS
* Migrated duplicator
* Migrated PSS
* Migrated algae pond
* Migrated froth flotation cell
* Migrated LTFR
* Migrated LPF
* Migrated sparge tower
* Migrated salt
* Migrated isamill
* Migrate DT
* Migrated HE
* Migrated mass fab
* Migrated chisel
* Migrated boiler
* Migrated steam machines
* Migrated amazon
* Disable batch mode button on XL turbines
* Update dependencies.gradle
* Updated dep
* Addressed first batch of reviews
* Migrated assembler
* Removed unused checkRecipe methods
* Forgot these
* Fix and cleanup chemplant
* Removed getAmounfOfOutputs
* Removed special multi behavior
* Migrated sound mostly
* Addressed new reviews
* Fix build fail and chisel sound
* Derp
* More reviews addressed
* Oversight on chemplant batchmode
* Fix DT speed bonus
* Removed iron blast furnace
* Removed generator array
* Removed
* Simplify rocket engine logic
* Removed left over artifacts
* Minor fixes
* Removed nerf chips
* Removed tesla tower
* Revert and fix chemplant recipe map
* Fix chemplant catalyst damaging
* Addressed reviews
* Derp
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
|
|
* Always store at least 2048 EU regardless of tier, so that the machine can work properly
should close #11190 in GTNewHorizons/GT-New-Horizons-Modpack
* change tooltip to match real formula
should close #13238 in GTNewHorizons GT-New-Horizons-Modpack
* shot in the dark to fix some chemical formulas
* Fix hardcoded formula for ZrF_4
* fix nitinol formula
* Add a method to count uppercase characters
* A better shot at fixing chemical formulas
Added ghetto detection of when there is more than 1 element in a grouping, even when their symbols combined don't exceed three characters (like hydroxide)
* fix material components in ammonium tetrafluoroberyllate
last in a series of commits designed to resolve #11340 in GTNewHorizons/GT-New-Horizons-Modpack
* Add a method that only exposes the data orb selected by the circuot
* Make the duplicator only check for recipes with the selected data orb
Should close #11583 in GTNewHorizons/GT-New-Horizons-Modpack
* Change TGS tooltip to reflect real behavior
* Change TGS info in NEI to reflect true behavior
Should close #11650 in GTNewHorizons/GT-New-Horizons-Modpack
* Don't remove energy from the PSS when it attempts to fill a full hatch
should resolve #13317 in GTNewHorizons/GT-New-Horizons-Modpack, where the issues was mistakenly identified as the PSS accepting power when it is full. In fact, it does stop accepting power when full, but it is constantly leaking power into hatches.
However it should be noted that unless the PSS has no hatches, it pays a tax each tick which will of course mean that it is almost never going to be filled up.
* Fix some minor errors due to writing all previous commmits with github's file-view edit feature
try it sometime and suffer!
also spotless apply
* better formatting
* off by one
* add a line for power loss in the gui
* fix 0iq moment
* Revert "Don't remove energy from the PSS when it attempts to fill a full hatch"
This reverts commit c20cc0b3a528872c8003bea2944aa1ad7a020e01.
* typo
* additional typo
* Delete layout.json
merp
|
|
|
|
* New multi class and calling the class
Enable the multi when loading
Config handler for the multi
More enabling
Multi controller recipe
Add necessary recipes to new, custom recipemap
Add function to generate new recipes
Declare item for the controller
Define recipe map for the multi
Render NEI page for the recipemap properly
Change P output from 7 to 6 in recipe
Spotless apply
* Revert Wildcard on compat handler
* Fixes in Salt Plant main class
* Remove run1 method
* Spotless apply
* add isInputSeparationButtonEnabled override
* spotlessApply (#615)
Co-authored-by: GitHub GTNH Actions <>
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
|
* yeet big reactor support
* yeet IC2 classic support
* yeet pneumaticraft support
* yeet More Planets support
* yeet Immersive Engineering support
* yeet Psychedilicraft support
* yeet Beyond Reality Core support
* sort mods to see what must be purged
* yeet simply jetpacks
* yeet RFTools
* yeet xReliquary
* yeet RedTech
* yeet Mekanism
* yeet GrowthCraft
* yeet ihl
* leftover cleaning
* yeet thermal fondation support
* yeet compact windmills support
* spotless
* remove constants from LoadedMods (part 1 / 2)
* spotless
* remove constants from LoadedMods (part 2 / 2)
* use mod id enum instead of strings + optimize imports
* Loaded.isModLoaded -> enum
* restore RA init
* missing !
* start organizing recipes stuff
* fix crash on world load in dev
* remove unused class
* remove HazmatUtils.java
* move all the removals
* remove enableHarderRecipesForHighTierCasings and usages(disabled in the pack)
* move some pyrolyse oven recipes to its own file
* sa
* bump GT version
* bump GT5U version
* spotless apply
* use Everglades entry from the mod enum
---------
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
|
|
* updateBuildScript
* Make chemplant tier visually 1-indexed
|
|
|
|
* Remove CORE.GTNH
* Remove LoadedMods.Gregtech
* Remove LoadedMods.IndustrialCraft2
* Remove LoadedMods.MiscUtils
* Remove CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK
* clean
* Remove mention to GT versions
* Fix assembler mode
|
|
|
|
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
|
|
This reverts commit 8db16fe8651701dd5b6e38acdc03bd6fbfaaee21.
|
|
|
|
|
|
* First Code Implementation
* First Textures Implementation
* Texture Name Fixes
* spotlessApply (#400)
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Controller ID Fix
* spotlessApply (#401)
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Reworked Recipe Map, Started Rework on recipes
* spotless
* fix recipe to actually use eternal singularity, make sure we can have a null fluid output
* add new blocks and some new textures
* Spotless apply for branch Chem_Line_Skipper for #399 (#406)
* fix material localization (#395)
* fix material localization
* spotlessApply
* Revert the Nerf to Algae Farm Casing Cost (#397)
- Changed the Algae Farm casing tier to the low tier it was supposed to be at, this time at MV and with no dirt. The casing is shared with the TGS, which was the reason for the nerf, but the controller can gate that multi;
- Adjusted the controller recipe for the Farm to also be MV.
* Fix Amount of Infinite Mutation Catalyst Output (#398)
- Changed output from 1 to 5 catalysts, to match the input of 5 carriers.
* Fix Sterile Farm Casing Recipe (No Tumbaga Pipe) (#402)
* fix frame box and block cant localized (#404)
* fix double plate and long rod cant localized (#405)
* fix double plate and long rod cant localized
* sa
* spotlessApply
Co-authored-by: iouter <62897714+iouter@users.noreply.github.com>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* First Changes to Add Chemplant Catalysts
* Spotless apply for branch Chem_Line_Skipper for #399 (#407)
* fix material localization (#395)
* fix material localization
* spotlessApply
* Revert the Nerf to Algae Farm Casing Cost (#397)
- Changed the Algae Farm casing tier to the low tier it was supposed to be at, this time at MV and with no dirt. The casing is shared with the TGS, which was the reason for the nerf, but the controller can gate that multi;
- Adjusted the controller recipe for the Farm to also be MV.
* Fix Amount of Infinite Mutation Catalyst Output (#398)
- Changed output from 1 to 5 catalysts, to match the input of 5 carriers.
* Fix Sterile Farm Casing Recipe (No Tumbaga Pipe) (#402)
* fix frame box and block cant localized (#404)
* fix double plate and long rod cant localized (#405)
* fix double plate and long rod cant localized
* sa
* spotlessApply
Co-authored-by: iouter <62897714+iouter@users.noreply.github.com>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Multi Forms with Catalyst Housing and Recipes in NEI
* spotless
* Remove Mufflers and Pollution
* New textures and make new casing to be used in the multi
* Make a working recipe check, add a Fluid only output mode
* Do not allow the ME Input Bus bug again. fixing it early
* replace the current glass with a new one
a real texture needs to be made
* fix catalysts being able to be used in the input bus and fix recipes not start from a second input bus
* Spotless apply for branch Chem_Line_Skipper for #399 (#412)
* fix material localization (#395)
* fix material localization
* spotlessApply
* Revert the Nerf to Algae Farm Casing Cost (#397)
- Changed the Algae Farm casing tier to the low tier it was supposed to be at, this time at MV and with no dirt. The casing is shared with the TGS, which was the reason for the nerf, but the controller can gate that multi;
- Adjusted the controller recipe for the Farm to also be MV.
* Fix Amount of Infinite Mutation Catalyst Output (#398)
- Changed output from 1 to 5 catalysts, to match the input of 5 carriers.
* Fix Sterile Farm Casing Recipe (No Tumbaga Pipe) (#402)
* fix frame box and block cant localized (#404)
* fix double plate and long rod cant localized (#405)
* fix double plate and long rod cant localized
* sa
* Update chemplant manual for TPV (#409)
* Update chemplant manual for TPV
* update BS
Co-authored-by: Martin Robertz <dream-master@gmx.net>
* fix crop manager log spam (#408)
* Recipe fixes 2022/10/25 (#410)
* Remove reflection from RTG Hatch (#411)
* Fix Material Progression and Semifluid Gen Cost (#403)
- Changed some materials used in GT++ material tier progression, because they require EBF coils above what is possible for the tier;
- Changed fluid input on LV Semifluid Generator recipe from Bronze to Tin, since Bronze cannot be fluid extracted in LV;
- Reduced the input count of items for those recipes, to bring it closer to the other generators.
* spotlessApply
Co-authored-by: iouter <62897714+iouter@users.noreply.github.com>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Guinea Wheek <guineawheek@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* fix overclocking with 1 energy hatch
* fix merging from master
* allow tectech energy hatches
* Update GT
* NEI migration & cleanup
Deprecate GTPP_Recipe_Map_Internal#sMappingsEx and delegate to GT_Recipe_Map#sMappings instead
Remove recipe modification check
* allow for parallel crafting in the QFT
* Plasma consumption and their respective hatches
* Initial Placeholders for QFT Recipes
* spotless
* get the fluids the correct way and make sure focusing requires neptunium
* Boiler
* New Plasma Recipes
* Remove Unused Catalyst Code
* Remove More Unused Code for Catalyst and Glass
* Refactor Crafting and Focusing Tiers
* spotlessApply (#441)
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* remove useless code, make the structure definition static and final.
* it works.
* address review
* spotlessApply (#442)
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* there are no catalyst housing, no mufflers either. and no need to override more than needed
* Crafting Casings Texture Update
* address more reviews. also preemptive fix for constant neptunium consumption
i am not doing more until tomorrow
* Small cleanups
* Programmed Circuit & Super Bus
* I dare you use mName for shapes again.
* Lower the number of fluid slots for multi mixer NEI
* Updated Focusing Textures and Added Statics
* Implementation of New Catalysts
* Recipes for Everything
* Spotless apply for branch Chem_Line_Skipper for #399 (#444)
* make structure definition fields static (#443)
* spotlessApply
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* add in a config option to change between animated and static textures
* More Recipe Additions
* spotless again
* merge dev fixes. maybe this was it?
this is hell
* update how fluid mode works
* update NEI
* update gt dep
* update gt version to the correct one. We need MUI god damnit
* set animated textures on by default
* BS+SA+fix
* just a normal gt++ pr
* Add Remaining Catalysts
* FIXES
* miozune request
* update dependencies
* add dense plates to be auto-genned
* rework recipes of the QFT, make the recipe map accept it as a catalyst
* add missed items to recipes
* change around some recipes. fix NEI. fix some localization
* do not set the recipe map for those hatches oops
* hatches are pain
* life a circle of pain
* change the placement of the Fermium and Neptunium Hatch. add tooltip information about it
* Add Kevlar recipe using bee comb
Adds additional bonus and solely for kevlar
* Fixed controller texture
* do some fixes. updata dependencies
* fix a small oopsie
* wait what
* Fix catalyst recipes
* fix not building
* quick spotless
* Some tooltip fixes
* Increase Fluid Input p/Tier on Recipe Tier Casings
* Buff t1 costs
* Increase Catalyst Costs to Near the QFT Cost
* Some last bug fixes
* Minimum energy hatches fix
* Change last return statement
* Spotless
* Oil is not required in the QFT
* Spotless again
* prepare texture names for Sampsa
* Sampsa's textures
* Restore Old Unused Texture Changes
* Update build.gradle
* force field renderer and some fixes
* forgot to make it render when working
* make client side
* remove uneeded things. add variables as local
* fix parallels
* spotless
* fix parallels
* quick thing to fix and prevent in the future
* forgot to use the same item damage oops
* fix to fluid mode. just edit the stacksize
* use copyAmountUnsafe
* update dependencies. fix overclocking
* correct overclocking
* lower amps you can use by 1/5th instead of 1/20th
* Update dependencies.gradle
* update BS
* remove jitpack
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com>
Co-authored-by: iouter <62897714+iouter@users.noreply.github.com>
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Guinea Wheek <guineawheek@users.noreply.github.com>
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: Runakai1 <Runatson@gmail.com>
|
|
|
|
* Update GT
* NEI migration & cleanup
Deprecate GTPP_Recipe_Map_Internal#sMappingsEx and delegate to GT_Recipe_Map#sMappings instead
Remove recipe modification check
* Boiler
* Programmed Circuit & Super Bus
* Lower the number of fluid slots for multi mixer NEI
* Solar Generator
* Crop Manager
* Bronze Workbench & Advanced Workbench
* Turbine Housing & Rotor Assembly
* Iron Plated Blast Furnace
* Player Safe
* Advanced Muffler Hatch
* spotlessApply
* Auto Workbench
* Breaker, Control Core, RTG Hatch, Steam Bus, some cleanup
* Fix crash when removing Breaker
* Data Orb Repository
* Charging/Discharging Bus
* Pollution Scrubber
* Storage Crate, Shelf, TieredChest
They're just broken in the first place, don't blame me
* cleanup
* Steam Condenser
It's broken in the first place, never blame me!
* Catalyst Housing, Ball Housing
* Fluid Tank, generators, custom hatches, cleanup
* Computer Cube MKII
Many things are broken in the first place, I swear
* Inventory Manager
* Migrate multiblock dehydrator recipemap to ModularUI
* Overflow cover
* Redstone Circuit Block
* Multiblock
* cleanup
* Update GT
|
|
|
|
This reverts commit 0121112e5ea9c72050957af2c2ad4aecd9d70270.
|
|
* ref(textures): replace deprecated texture objects with api
* :spotlessapply
|
|
* Bugfixes, Processing Speed and Gas Output Changes
- Changed a few restrictions to allow this chain to be doable in IV, as intended;
- Changed the EU/t of the 3 fuels to match the usage of 4 buffered dynamos, and reduced the burning time to keep the total energy per L the same;
- Lowered the recipe time of some recipes done in multiblocks;
- Other tooltip and bug fixes.
* Spotless apply for branch LFTR_Work for #345 (#346)
* update BS+Spotless
* Fix healing device never getting discharged (#343)
* spotlessApply
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com>
|
|
* Convert AES.java to readable class
* Buildscript
* Spotless
|
|
* Flotation Cell fixes
* Add info on type locking
* address review
|
|
* NEI Cleanup
* adjustments
|
|
* Fix IsaMill controller GUI void items
* Add structure check for Milling Ball Housing
* Fix internal crash that was handled somewhere else
* Fix ore type can be locked to 0
* Add scan result for locked ore type
* Fix height in tooltip
* Delegate to native isRecipeInputEqual
* Don't consume energy to fill water
* Fix flowing water is not filled sometimes
* Add info about filling water
* Fix carelessness
* Fix flowing water in Algae Farm
|
|
* Added NEI handler for TGS.
Added BoP support to TGS.
Added base work for LFH.
* Added Witchery support to TGS.
* Finished LFH.
Added missing steam multiblock.
Fixed GT++ NEI time values not being precise enough.
* Implement Fert use in TGS.
* Fix broken checkRecipes.
Did initial work for XLHE.
Other misc. stuff.
* Update GregtechLargeTurbinesAndHeatExchanger.java
* Update RECIPES_Machines.java
Changes requested by @Dream-Master
|
|
Added some foils for @GTNH-Colen.
Fixed scanner output on LRE.
Formatting~
Fix Crop Manager giving stacks > 64.
|
|
|
|
Added Potassium Nitrate.
Added Sodium Nitrate.
Added Hot/Cold Solar Salt.
Added recipes for the above.
Added Solar Salt processing to Thermal Boiler.
Re-added Assembly Line MKII, Tesla Tower. (WIP)
|
|
Add base for Multiblock Molecular Transformer.
|
|
|