aboutsummaryrefslogtreecommitdiff
path: root/src/main
AgeCommit message (Collapse)Author
2017-08-13Added Ass. recipes for Electronic Circuit components, reduced GT timeJohannes Gäßler
The following components can now be made in an Assembling Machine: -Coated Circuit Board (-62.5% Sticky Resin cost) -Vacuum Tube (-33% Copper/Paper cost) -Phenolic Circuit Board (-20% Glue/Bisphenol A cost) The time needed to make Glass Tube in the Alloy Smelter has been reduced: 12s -> 8s
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-12Pump tooltipsMuramasa-
2017-08-11Show dim id with scannerMuramasa-
2017-08-11implements #1061Muramasa-
2017-08-11Some tooltip info #1183Muramasa-
2017-08-11maybe correct #1137Muramasa-
2017-08-11Merge pull request #1172 from JohannesGaessler/MoreItemPipeMaterialsBlood-Asp
More Item Pipe Materials
2017-08-11Merge pull request #1171 from JohannesGaessler/PyrolyzeOvenCoilScalingBlood-Asp
Pyrolyse oven coil scaling
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 #1162 from JohannesGaessler/CrackingBalanceFollowupBlood-Asp
Cracking Balance Followup
2017-08-11Merge pull request #1159 from JohannesGaessler/AshRebalanceBlood-Asp
Ash rebalance
2017-08-11Merge pull request #1158 from JohannesGaessler/StoneDustRebalanceBlood-Asp
Stone Dust 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 #1156 from Antifluxfield/distillery-recipe-fix-altBlood-Asp
Another Distillery recipe fix
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-11Merge pull request #1144 from Dimach/unstableBlood-Asp
Fixed coloring of pyrolyse oven.
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-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-07Reverted the change that gated Plastic at MV. It's available at LV againJohannes Gäßler
2017-08-07Replaced Tin with Wrought Iron as Item Pipe MaterialJohannes 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 a bug with ghost Items left behind in the Large Chemical ReactorJohannes Gäßler
2017-08-06Fixed a bug where a recipe had the wrong amount of CellsJohannes Gäßler
2017-08-06Fixed accidental change to the Cumene recipes due to not pullingJohannes Gäßler
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-06Fix imbalanced recipeAntifluxfield
2017-08-06Removed Burn Value for Carbon Dust.Johannes Gäßler
2017-08-06Added the Large Chemical Reactor Controller inventory to the item inputJohannes Gäßler
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-05Enabled Coal/Charcoal/Coal Coke Blocks for the Primitive Blast FurnaceJohannes Gäßler
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-04Fixed a bug with ghost Items left behind in the Large Chemical ReactorJohannes Gäßler
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-02Multiblock Chemical Reactor now also automatically adds an Int. Circ.Johannes Gäßler
2017-08-02Reenabled regular Rubber for the EV Conveyor BeltJohannes Gäßler
2017-08-02Add pages to arrayTechnus
2017-08-02Expand to add proper texture paging support.Technus
2017-08-02Find a better way to handle those dustsAntifluxfield
2017-08-02Merge branch 'unstable' into AshRebalanceJohannes Gäßler
Conflicts: src/main/java/gregtech/api/enums/Materials.java