aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
AgeCommit message (Collapse)Author
2017-08-19Merge branch 'unstable' into PyrometallurgyUpdateJohannes Gäßler
Conflicts: src/main/java/gregtech/GT_Mod.java src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/common/GT_Proxy.java src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2017-08-17Fix use of RedstoneAlloy resulting in broken recipeMuramasa-
2017-08-11implements #1061Muramasa-
2017-08-11Merge pull request #1172 from JohannesGaessler/MoreItemPipeMaterialsBlood-Asp
More Item Pipe Materials
2017-08-11Merge pull request #1162 from JohannesGaessler/CrackingBalanceFollowupBlood-Asp
Cracking Balance Followup
2017-08-07Reverted changes to Mercury Ore Washing.Johannes Gäßler
2017-08-07Fixed a bug where the Nugget amount did not scale with the configJohannes Gäßler
2017-08-07Reverted the Galena formula: PbS -> Pb3Ag3S2Johannes Gäßler
2017-08-07Replaced Tin with Wrought Iron as Item Pipe MaterialJohannes Gäßler
2017-08-02Merge branch 'unstable' into AshRebalanceJohannes Gäßler
Conflicts: src/main/java/gregtech/api/enums/Materials.java
2017-07-26Increased output chance for Silver from washing with Mercury to 99%Johannes Gäßler
2017-07-26Added a config for the converion rate of Direct Smelting: 1 <-> 2/3Johannes Gäßler
2017-07-24Fixed a bug where a recipe had the wrong amount of CellsJohannes Gäßler
2017-07-24Added Item Pipes made from Tin, Nickel, Cobalt, AluminiumJohannes Gäßler
2017-07-24Increased Direct Smelting yield: 5 Nuggets -> 6 NuggetsJohannes Gäßler
Previously you would only get 1 extra Nugget from Macerating Ore. Now you get 3 extra Nuggets.
2017-07-24Implemented Carbothermic Reduction for Silicon DioxideJohannes Gäßler
2017-07-23Changed Galena Formula: Pb3Ag3S2 -> PbS, added PbS -> Pb direct smeltingJohannes Gäßler
Also added the corresponding pyrometallurgical recipes.
2017-07-23Removed redundant Magnetite Blast recipeJohannes Gäßler
2017-07-23Fixed accidental change to the Cumene recipes due to not pullingJohannes Gäßler
2017-07-23Implemented Roasting and Carbothermic Reduction for the EBF.Johannes Gäßler
2017-07-23Fixed Salt processing recipesJohannes Gäßler
SaltWater now yields the same amount of material as Salt Dust. Increased the energy cost of electrolyzing Salt to make netto energy yield via NaOH+Hydrogen negative.
2017-07-23Added BBF Recipes for increased output from Direct SmeltingJohannes Gäßler
2017-07-22Reworked Direct Smelting, added Magnetite -> Iron smeltingJohannes Gäßler
All Direct Smelting recipes now yield 1 ingot per Ore Block or 5 Nuggets per Crushed Ore/Dust
2017-07-22Reduced direct smelting from impure/purified dustJohannes Gäßler
2017-07-22Fix imbalanced recipeAntifluxfield
2017-07-16Adjusted cracked fluid distillation speed, LightFuel/Naphtha balanceJohannes Gäßler
2017-07-16Added config options for old ash recipes, tweaking ash outputJohannes Gäßler
2017-07-16Added recipes for CaO, MgO, reenabled falsely disabled Steel Ash outputJohannes Gäßler
2017-07-15Changed the Ash centrifugation recipe to the new materials.Johannes Gäßler
2017-07-08Fix Item Distributor recipesAntifluxfield
2017-07-06Merge pull request #1132 from JohannesGaessler/ItemDistributorBlood-Asp
Item Distributor
2017-07-06Merge pull request #1142 from Dimach/minersBlood-Asp
Added LV and MV miners.
2017-07-06Merge pull request #1126 from Antifluxfield/PE-polymerization-fixJohannesGaessler
Trying to fix PE polymerizing recipe
2017-07-06Added LV and MV miners.Dimach
2017-07-03Fix the names of Data Access HatchesAntifluxfield
2017-07-03Update GT_MachineRecipeLoader.javaAntifluxfield
2017-07-02Fixed Diluted Sulfuric Acid recipes, PTFE Pipe Casing nameJohannes Gäßler
2017-07-01fix cheese as dough #1123Blood-Asp
2017-07-01Make assembly line use cheaper circuit techs. #1114Blood-Asp
2017-07-01Added ItemDistributor crafting recipes, reordered ItemDistributor fieldsJohannes Gäßler
2017-06-30Update GT_MachineRecipeLoader.javaAntifluxfield
2017-06-30Update GT_Loader_MetaTileEntities.javaAntifluxfield
2017-06-30Update GT_Loader_MetaTileEntities.javaAntifluxfield
2017-06-30Add a low-tier Data AccessAntifluxfield
2017-06-30Adding Data Access HatchAntifluxfield
2017-06-28Trying to fix PE polymerizing recipeAntifluxfield
These recipe confilcts with the PE polymerizing recipe with oxygen. Just add an Integrated Circuit in the recipe.
2017-06-26Fixed Dual Fuel Rod names, Tungstencarbide, removed some EBF Ash outputsJohannes Gäßler
2017-06-26Merge branch 'unstable_blood' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/api/enums/MaterialBuilder.java src/main/java/gregtech/common/GT_RecipeAdder.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-25Merge branch 'BrickedBlastFurnace' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/GT_Mod.java src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/common/GT_Proxy.java src/main/java/gregtech/common/blocks/GT_Block_Casings4.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-25Merge branch 'OilRefining' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java