aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
AgeCommit message (Collapse)Author
2017-09-15Improve i18nAntifluxfield
2017-09-15Improve i18nAntifluxfield
2017-09-14Update GT_MetaTileEntity_Buffer.javaAntifluxfield
Fix Interaction_DESCRIPTION_Index_099
2017-09-13cherrypickTechnus
2017-09-12Merge pull request #1211 from Antifluxfield/patch-2Blood-Asp
Fix localization of Item Distributor
2017-09-12Merge branch 'unstable' into drillers-upgradeBlood-Asp
2017-09-11Fix l10n of Item DistributorAntifluxfield
2017-09-03Merge branch 'unstable' into CircuitChemistryUpdateFollowupBlood-Asp
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 branch 'unstable' into patch-5Blood-Asp
2017-09-03Merge pull request #1174 from Dimach/unstable-3Blood-Asp
Added new function to GT scanner
2017-09-03Merge pull request #1147 from SLiMylya/addnewbatteryBlood-Asp
Add new zpm and uv battery
2017-08-25Revised Hydrochloric Acid recycling, Salt electrolyzation costJohannes Gäßler
Hydrochloric Acid can be recycled at 100% efficiency. The production of Dimethylhydrazine, Tetrafluoroethylene, Polydimethylsiloxane, and Hypochlorous Acid yields Diluted Hydrochloric Acid, which can be recycled at 50% efficiency. The energy cost of 21600 EU per 2 Salt -> Sodium + Chlorine has turned out to be too high. The cost is now 9600 EU.
2017-08-24Added missing Tetraitromethane, Polymerization recipesJohannes Gäßler
2017-08-21Use "/n " as seperatorAntifluxfield
2017-08-21Improve tooltipAntifluxfield
Now the metaitems can automatically seperate its tooltip to multiple lines with "////".
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-19Merge remote-tracking branch 'origin/unstable' intoJohannes Gäßler
CircuitChemistryUpdateFollowup Conflicts: src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/common/GT_RecipeAdder.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2017-08-19Old chemical recipes are now enabled by default, marked as deprecatedJohannes Gäßler
2017-08-16Update GT_MetaTileEntity_MultiBlockBase.javaAntifluxfield
2017-08-16Clean up importsAntifluxfield
2017-08-16Move the Data-Access codes only to those who really needs them.Antifluxfield
2017-08-13Reverted the changes to basic machine processing.Johannes Gäßler
Basic Machines no longer automatically add an integrated circuit to their input.
2017-08-12Fix NPE, GREG why u no crash game!Technus
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-05Just in case the number goes negativeJohannes Gäßler
2017-08-04Update commentaryDaniel
2017-08-04Fix rare case of texture not updating when:Technus
Changing texture from page x to page 0 without changing the texture id
2017-08-03Fix one missing spot in deprecated api.Technus
(for texture change use that is)
2017-08-03Minor error correctionDaniel
We have 16 tiers of textures.
2017-08-03More compatible attemptTechnus
2017-08-02Add pages to arrayTechnus
2017-08-02Expand to add proper texture paging support.Technus
2017-08-02Merge branch 'unstable' into AshRebalanceJohannes Gäßler
Conflicts: src/main/java/gregtech/api/enums/Materials.java
2017-08-01Made Niobium more accessibleJohannes Gäßler
Niobium can now be obtained from Apatite and Pyrolusite as Byproducts. apatite veins now also contain Pyrochlore (new materials, contains Niobium) instead of Phosphate (PO4).
2017-08-01Added a line to the NEI handler that hints at leaving IntCirc(0) emptyJohannes Gäßler