aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
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-11Show dim id with scannerMuramasa-
2017-08-11Merge pull request #1176 from Dimach/unstable-4Blood-Asp
Added new info to batbuffer nuclear control panel and fixed bug
2017-08-11Merge pull request #1159 from JohannesGaessler/AshRebalanceBlood-Asp
Ash rebalance
2017-08-11Merge pull request #1157 from Dimach/unstable-1Blood-Asp
Fixed bug - isAllowedToPutIntoSlot don't check size of inventory.
2017-08-11Merge pull request #1153 from JohannesGaessler/MultiblockFluidIOFixBlood-Asp
Multiblock Fluid IO fix
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-07Made the tooltips for Multiblock Hatches more descriptive.Johannes Gäßler
2017-08-07Reverted the Galena formula: PbS -> Pb3Ag3S2Johannes Gäßler
2017-08-06Fluid can now also be locked via cells, added a chat messageJohannes Gäßler
2017-08-06Implemented NBT for the Locked FluidJohannes Gäßler
2017-08-06Output Hatches can now be locked to a specific fluidJohannes Gäßler
Currently not working as intended
2017-08-06Fixed 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-08-06Fixed 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-08-02Merge branch 'unstable' into AshRebalanceJohannes Gäßler
Conflicts: src/main/java/gregtech/api/enums/Materials.java
2017-07-30Added new info to batbuffer sensor card (nuclear control panel) - average ↵Dimach
input and output. Also fixed bug in average input/output calculation.
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-24Implemented Fluid Output for the EBFJohannes Gäßler
Regular Fluids are put out at the bottom layer. CO2, CO, and SO2 are put out at the top layer and their amount scales with the tier of the EBF's Muffler Hatch
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-15Fixed bug - isAllowedToPutIntoSlot don't check size of inventory.Dimach
2017-07-11Added an option to findRecipe() to only return recipes with enough inputJohannes Gäßler
2017-07-10Made it so that multiblocks will look for empty output hatches.Johannes Gäßler
Previously when there was more than one fluid output multiblocks would only try to put it into one of the output hatches.
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-06Merge pull request #1132 from JohannesGaessler/ItemDistributorBlood-Asp
Item Distributor
2017-07-06Merge pull request #1135 from JohannesGaessler/InventoryIndexFixBlood-Asp
Fixed inventory misalignment when updating 5.09.30 -> 5.09.31
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-03Update IGT_RecipeAdder.javaAntifluxfield
2017-07-02Accounted for misc slots when shifting machine inventory contentsJohannes Gäßler
2017-07-02Added a method for calculating total version IDJohannes Gäßler
2017-07-02Fixed inventory misalignment when updating 5.09.30 -> 5.09.31Johannes Gäßler
I added a new method to BaseMetaTileEntity that shifts the Inventory index according to the change in Input/Output slots. Instrumentally I have added a new version ID that considers the GT subversion.
2017-07-01Fix cover and mode spellingBlood-Asp
2017-07-01Merge pull request #1129 from Antifluxfield/PlayerDetector-fixBlood-Asp
Player detector fix
2017-07-01Merge pull request #1130 from Antifluxfield/AssemblyLine_upgradeBlood-Asp
Assembly line upgrade
2017-07-01Merge pull request #1128 from Dimach/oil-fixBlood-Asp
Removed divider that already applied in Gt_UndergroundOil.
2017-07-01Made Automation tooltips more descriptiveJohannes Gäßler
Adjusted allowPutStack, isInputFacing, isOutputFacing for the Item Distributor Adjusted onScrewdriverRightClick for the Item Regulator
2017-06-30Added a new texture for the Item DistributorJohannes Gäßler
2017-06-30Update IGT_RecipeAdder.javaAntifluxfield