aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-12Post-Conflict Merge fixes.Alkalus
2021-12-12Merge branch 'master' of https://github.com/GTNewHorizons/GTplusplus into ↵Alkalus
gtnh-milling # Conflicts: # build.properties # src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
2021-12-12Locale Fixes.Alkalus
2021-12-12Add one final milling recipe for Monazite.Alkalus
2021-12-12Migrate Assembly Line recipes to new OreDict handler.Alkalus
Added missing file RecipeGen_MetalRecipe.java.
2021-12-12Add recipes for Sparging Multiblock.Alkalus
Add some localization. Migrate material recipes out of item classes.
2021-12-12Revert hatch handling in GregtechMetaTileEntity_SpargeTower.Alkalus
2021-12-12Fixed cells being consumed in nuclear reprocessing.Alkalus
Removed some debug logging. Removed ClassTransformer_CC_GuiContainerManager. Improved handling in GT_NEI_LFTR_Sparging. Added Erbium. Added HeLiCoPtEr.
2021-12-12add recycle recipeGlodBlock
2021-12-12Merge pull request #20 from boubou19/masterMartin Robertz
add recipe for infinite oil rig
2021-12-12add infinite oil rig (#795)boubou19
* add infinite oil rig * fix typo * get same speed as the oil rig III * adjust speed for the infinite oil rig
2021-12-11Fix Sir-Mixalot crash.Alkalus
2021-12-11Cleanup.Alkalus
2021-12-11More Cleanup.Alkalus
2021-12-11Cleaned up GregtechMTE_NuclearReactor.java.Alkalus
2021-12-11Removed an unused import from HANDLER_GT.Alkalus
Balanced FFPP fuel production recipes.
2021-12-11Fixed issue of Multiblock hatches/buses not being assigned recipe maps.Alkalus
Removed 7 from Charge Pack tooltips. Initial work on Elemental Duplicator.
2021-12-11add recipe for infinite oil rigboubou_19
2021-12-12fix number consistYang Xizhi
2021-12-11addd two new fuelGlodBlock
2021-12-11fix NPE (#794)Yang Xizhi
* make the debuff time depend on contents * fix npe in fluid
2021-12-11Adjusted LFTR a bit.Alkalus
2021-12-11Fixed ChemPlant book.Alkalus
2021-12-11add Cryolite Bee and combs (#793)Martin Robertz
* add Cryolite Bee and combs * add Cryolite Block
2021-12-10Fixed hot ingot recipes.Alkalus
2021-12-10Added HS-188A.Alkalus
Fixed NEI handling for some handlers. Fixed some tooltips.
2021-12-10turbine compact for BW material (#67)Yang Xizhi
* add full dust recipe in plat-line * fix derp * turbine compact for BW material Former-commit-id: 48010f4899be5848a6961a471307328a1f309265
2021-12-10Revert "us us version of cofh core"Martin Robertz
This reverts commit 638ca152bb613e986a25ed5a7a9049bb1fdd5dbb.
2021-12-10us us version of cofh coreMartin Robertz
2021-12-10Migrate some recipe from GTNH CoreMod.Alkalus
2021-12-10change Graphene recipes (#792)Martin Robertz
* change Graphene recipes add new tiered recipes * move graphene recipe one tier up
2021-12-10More Tooltips.Alkalus
Dehydrator improvements. Fixed Circuit Programmer not working for Breakthrough Circuits.
2021-12-10remove the broken baisc chemreactor recipeGlodBlock
2021-12-10Overflows overflows everywhere (#791)Jason Mitchell
* Reformat * Stop energy calcs from overflowing by switching int->long in several places in the new graph code to be consistent with how they're used elsewhere.
2021-12-10Updated lots of tooltips.Alkalus
Made low tier tanks portable, now that higher tier tanks are. Fixed ULV gens not working correctly. Disabled ClassTransformer_GT_ItemMachines_Tooltip.
2021-12-10mojor fixGlodBlock
2021-12-10Added ability to clear all output hatches on GT++ multis with a plunger.Alkalus
Changed fluid textures for many autogenerated fluids. Renamed & remapped Cryolite to Cryolite (F). Fixed toArray() in AutoMap.java. Fixed Sparging. Final touches to Nuclear Fuel reprocessing.
2021-12-09Allow toolbox usage for maintenance w/o opening GUI (#790)repo-alt
(Also resolves https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9044)
2021-12-09Added a new multiblock for sparging.Alkalus
More Nuclear reprocessing work. Updated Tooltips on all multiblocks.
2021-12-09add full dust recipe in plat-line (#65)GlodBlock
* add full dust recipe in plat-line * fix derp Former-commit-id: d30ee1ba8c33eee34820e5e66d5a4a52320abb70
2021-12-09remove duplicate recipes (#789)bombcar
2021-12-09Add threshold support to item and fluid covers (#785)D-Cysteine
* Add threshold support to item and fluid covers * Switch to storing in NBT * Add handling for migration path * Adjust item threshold max value
2021-12-08Fix assline oredict support (#786)Glease
* Fix assline oredict support * Fix assline hash generation depending on transient states
2021-12-08Distillation circuit (#784)Martin Robertz
* add input slots to Distillation Tower * borrow Large chemical reactor code to make it show up in Nei * add itemstack to Distillation multi machine code (cherry picked from commit e6e4203979340fc21f8ef4e1d6e9d0376afd3ef6) * remove unnecessary checks Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
2021-12-08target concrete branches on push in scala test (#788)Dmytro
2021-12-08Try to fix GT covers limited to 1 plate #9028 (#787)Martin Robertz
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9028 New railcraft tanks recipe conflicts #9026 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9026
2021-12-08Add circuit programmer as a tool to reprogram circuits with infinite ↵Glease
durability (#62) Former-commit-id: 2e3051c7bafd1c934d82ef48ec65d948a0b5e6eb
2021-12-08Merge pull request #62 from Florexiz/masterMartin Robertz
Fix typo in Zyngen tooltip
2021-12-08ok (#64)bombcar
Former-commit-id: 81a404d8c6b28764c9dc5630fe77286077cd3cb7
2021-12-08Unify build scriptJohann Bernhardt