aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
AgeCommit message (Collapse)Author
2018-12-11cherry pick cd841ad39edfef8c4f32096416b0c68b98ccc96eYoungGT
Fix #1439 and #1456 (#1503) * Fix #1439 * Fix #1456 * mistake
2018-12-11Fix maintenance cover (#1496)UhoMazino
* New public variable init Initiated new public variable which is calculate how much damage get turbine rotor per time, its needed to compare with actual rotor durability. * Fix cover logic Rewrited due a bug maintenance cover logic which is check turbine rotor needed maintenance or not. * Added&rewrited some features for need maintenance. Added new high accuracy mod for need maintenance cover which check rotor state. Fixed old version low accuracy mod. * redo older changes removed variable * fix some shit forgot brakets * Cleanup & reformat code thanks Dimach for help with that
2018-12-11cherry pick 0beea9037cd8ff7a899c14c53d6b9a381c22f42cDimach
Add volumetric flask. (#1500)
2018-12-11Cehrry pick d1e010d53f2cd90ac5855ec6673a393731bc20f9Dream-MasterXXL
Better NC panel input/output format and additional book recipe (#1501) * Update src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java * Update src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2018-12-09Also allow any number to be used while making ore dict thingsTechnus
2018-12-02Revert "issue with malachite ore (nether version) #3872"Dream-Master
This reverts commit 56c6a1230882d9fe9b3abc3f8b9bbea9a018d57a.
2018-12-02Cannot craft Foresty Copper Electron Tubes in the GT Assembling Machine. #3871Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/3871 change it back to LV
2018-12-02issue with malachite ore (nether version) #3872Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/3872
2018-11-28MV Output Bus is not possible to craft #3867Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/3867
2018-11-24Potassium nitrade dust recipe missing ingredients #3855Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/3855
2018-11-23Some mistakes in GregTech.lang #3853Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/3853
2018-11-20revert Bedrockium MaterialsDream-Master
2018-11-20deep iron added to ebf listDream-Master
2018-11-20change material enums a bit for new ebf coilsDream-Master
2018-11-20add mor 1k more heat cap for all coilsDream-Master
2018-11-20change temp of ebf coils 1k upDream-Master
2018-11-20add new temps to materialsDream-Master
2018-11-20Merge branch 'experimental' into New-EBF-CoilsDream-Master
2018-11-20New EBF Coils 12k and 15kDream-Master
Electrum Flux and Awakened Draconium
2018-11-19HV energy hatches too expensive #3844Dream-MasterXXL
https://github.com/GTNewHorizons/NewHorizons/issues/3844
2018-11-18Can't craft ZPM Dynamo Hatch #3838Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/3838
2018-11-18UV/UHV Motor are uncraftable #3839Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/3839
2018-11-17normal rubber allowed in luv pump #3834Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/3834
2018-11-16oil recipe was wrongDream-Master
2018-11-15Etched Low Voltage Wiring is using just one lens #3831Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/3831
2018-11-13remove zpm2 and 3 research recipe because in tec tech nowDream-Master
2018-11-11remove uhv and uev recipes recipes because they are in Tec Tech now.Dream-Master
2018-11-11add materials for nano, piko and quantumDream-Master
2018-11-11assembler guis with 9 slotsDream-Master
2018-11-09Nerf neutronium shaping through smelting->moulding #3820Dream-Master
reducing Mass of neutronium by 100x
2018-10-29PowerUp SlatesСпартак
2018-10-29Add BloodMagic's slates in Magic AbsorberСпартак
2018-10-28Alternative Magic Energy Generator - Blood Power #3769Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/3769
2018-10-28Suggestion: Alloy smelter recipes move/clone in other machines #3770Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/3770
2018-10-27Merge remote-tracking branch 'origin/bmf2' into experimentalDream-Master
2018-10-27+added fake oredict for CircuitAssemblerRecipes with Circuitsbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2018-10-27add 9 slot assemblerDream-Master
change tank capacity in assemblers remove double fluid regulator recipes
2018-10-27change Biom material for Bio CircuitDream-Master
2018-10-27try to add more circuits to assembler recipes to fluid hatchesDream-Master
2018-10-27Revert "try to fix the iv hatches"Dream-Master
This reverts commit adf2c4c8ceea284ccad539e37c4ef7a124b0b361.
2018-10-27try to fix the iv hatchesDream-Master
2018-10-27fix derp with growth mediumDream-Master
2018-10-27fusion controler changed recipes for zpm and uvDream-Master
2018-10-27change Mk1 fusion controllerDream-Master
2018-10-26change recipes like growth medium. feel the power of pain. Aproved by @0lafe :)Dream-Master
2018-10-26remove groth medium from combs because dumbDream-Master
2018-10-26remove tooltipDream-Master
2018-10-26remove dissabeling eggsDream-Master
2018-10-26Merge branch 'experimental' of ↵Dream-Master
https://github.com/GTNewHorizons/GT5-Unofficial into experimental
2018-10-26change recipes for growth medium.Dream-Master
Aproved by @0lafe