aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
AgeCommit message (Collapse)Author
2017-09-03Merge pull request #1184 from GTNewHorizons/texture_overhaulBlood-Asp
Texture overhaul
2017-09-03Merge pull request #1170 from JohannesGaessler/PyrometallurgyUpdateBlood-Asp
Pyrometallurgy update
2017-09-03Merge pull request #1147 from SLiMylya/addnewbatteryBlood-Asp
Add new zpm and uv battery
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-11Merge pull request #1159 from JohannesGaessler/AshRebalanceBlood-Asp
Ash rebalance
2017-08-11Merge pull request #1149 from joakibj/fix-orebasalticmineralsandBlood-Asp
Fix oreBasalticMineralSand properly being mapped to "ore" prefix
2017-08-07Reverted changes to Mercury Ore Washing.Johannes Gäßler
2017-08-07Reverted the Galena formula: PbS -> Pb3Ag3S2Johannes Gäßler
2017-08-03Minor error correctionDaniel
We have 16 tiers of textures.
2017-08-03More compatible attemptTechnus
2017-08-02Add pages to arrayTechnus
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-25Moved material IDs for the new materials due to Ash Rebalance materialsJohannes Gäßler
2017-07-24Updated DONT_ADD_DEFAULT_BBF_RECIPE StringJohannes Gäßler
2017-07-23Changed Galena Formula: Pb3Ag3S2 -> PbS, added PbS -> Pb direct smeltingJohannes Gäßler
Also added the corresponding pyrometallurgical recipes.
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-16Fixed a bug where Brick, Clay, and Fireclay had the wrong texture sets.Johannes Gäßler
The above materials originally had the ROUGH texture. I tested what they would look like with the DULL texture and I forgot to revert it afterwards.
2017-07-15Added Ash component MaterialsJohannes Gäßler
2017-07-09update changeSLiMylya
2017-07-09Fix oreBasalticMineralSand properly being mapped to "ore" prefix, instead of ↵Joakim Bjørnstad
the "oreBasalt" prefix, yielding the wrong material "icMineralsand"
2017-07-09Fix another 2 formulasAntifluxfield
S2O => SO2; S3O => SO3.
2017-07-08add batterySLiMylya
2017-07-06Merge pull request #1132 from JohannesGaessler/ItemDistributorBlood-Asp
Item Distributor
2017-07-06Added LV and MV miners.Dimach
2017-07-01Merge pull request #1130 from Antifluxfield/AssemblyLine_upgradeBlood-Asp
Assembly line upgrade
2017-06-30Added a new texture for the Item DistributorJohannes Gäßler
2017-06-30Update Textures.javaAntifluxfield
2017-06-30Update ItemList.javaAntifluxfield
2017-06-30Adding Data Access HatchAntifluxfield
2017-06-28Fixed 2 formulaeAntifluxfield
TiC2Cl2 => TiCl4; HPO4 => H3PO4.
2017-06-27Corrected Plutonium Isotope: 244 -> 239Johannes 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
2017-06-25Optimize imports - intelliJ one button actionTechnus
2017-06-24Created a non-functional first draft of the Item DistributorJohannes Gäßler
2017-06-23Added Bricked BF config, fixed Primitive BF class hierarchyJohannes Gäßler
Blast Furnace Recipes using Coal or Charcoal now yield Dark Ash instead of Ash.
2017-06-23Fixed several Material formulasJohannes Gäßler
RedAlloy, TungstenCarbide now have the correct formula. Changed the formula of Lignite, it no longer contains Ash Fixed the algorithm for determining whether or not to put brackets around a partial Material.
2017-06-18Merge remote-tracking branch 'origin/unstable' into OilRefiningJohannes Gäßler
Conflicts: src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-18Merge branch 'ChemistryUpdate' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/api/enums/ItemList.java src/main/java/gregtech/api/enums/Textures.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-17Implemented crafting recipes for the Bricked Blast FurnaceJohannes Gäßler
fixed Glass Hammering consuming 40x more energy than intended Fixed Hammer recipes that (presumably unintentionally) had 10EUt, 16 ticks instead of 16EUt, 10 ticks. Renamed Dense Bricks -> Firebricks
2017-06-17Merge pull request #1074 from Techlone/advminer2_improvementsBlood-Asp
AdvMiner2 renamed; new tiers of OreDrillingPlant
2017-06-17Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' intoJohannes Gäßler
BrickedBlastFurnace Conflicts: src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/api/enums/Textures.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-15Merge remote-tracking branch 'origin/unstable' into ChemistryUpdateJohannes Gäßler
Conflicts: src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java src/main/java/gregtech/loaders/load/GT_FuelLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
2017-06-14Returned BioFuel to its previous state, added BioDiesel instead.Johannes Gäßler
There are artifacts for fluids called BioFuel, therefore the change.
generated by cgit (git 2.46.0) at 2025-03-13 08:49:08 +0000