aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
AgeCommit message (Collapse)Author
2020-04-10Merge branch 'experimental' into fixesbartimaeusnek
2020-04-10UHV fixesbartimaeusnek
+ updated tritanium color Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-10different fixesbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-10Void miner adjustments (#262)bartimaeusnek
* Added all Ores to Voidminer in DeepDark + removed Infinity Ore Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> * renormalize line endings Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-10renormalize line endingsbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-10Added all Ores to Voidminer in DeepDarkbartimaeusnek
+ removed Infinity Ore Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-10Removed T5 & T6 Minersbartimaeusnek
+ Added BW Compat for easier use of BW Materials in code + Removed DD Veins Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-07Merge branch 'experimental' into Ore-Drilling-T5+T6Dream-Master
2020-04-07add missing printer backDream-Master
add missing ids to processing array
2020-04-06Added a better way for the Processing Array to handle recipes.Dream-Master
https://github.com/Blood-Asp/GT5-Unofficial/pull/1551 add missing Packer machines back
2020-04-06Merge branch 'experimental' into Ore-Drilling-T5+T6Technus
# Conflicts: # src/main/java/gregtech/api/enums/Textures.java
2020-04-06Texture paging names should match...Technus
2020-04-06Texture paging implementedTechnus
2020-04-06Commented texture pagingTechnus
2020-04-06Merge branch 'experimental' into Ore-Drilling-T5+T6Dream-Master
2020-04-06change Melodic Alloy space in NameDream-Master
add Pink Slime to EBF and Vac add shapeless recipe for Clay Compound
2020-04-06change ender io materialDream-Master
add crafting recipes
2020-04-06change color of Crude steel and Pink slime a bitDream-Master
2020-04-06add more Ender IO material properties to material list.Dream-Master
2020-04-05CrudeSteelDaniel
makes GTMaterial match up with EnderIO material
2020-04-05add new Enderi IO materials to GTJason Mitchell
2020-03-23First attemp to add Ore drilling Plant Luv and ZPMDream-Master
2020-03-22Merge remote-tracking branch 'origin/experimental' into Very-ExperimentalDream-Master
# Conflicts: # build.properties
2020-03-22refactored "static" Method (#253)bartimaeusnek
* refactored "static" Method + removed bugged enchantments on ichorium + added smite 8 for ichorium instead + refactored "initMaterialProperties" Method Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> * added in forgotten sub method Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> * forgot to add "1" to the string builder length
2020-03-17Merge branch 'Refactor' into BeesDream-Master
2020-03-17reverted parallel stream changebartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored fixed 2 code smells in dyesbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored Materials.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored OrePrefixes.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored SubTag.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored TC_Aspects.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored Textures.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored TextureSet.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored Tier.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored MaterialBuilder.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored ItemList.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored GT_Values.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored Element.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-15add generate plates for marble and basaltDream-Master
2020-03-07Basalt GT covers #5683Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/5683
2020-03-02Add separate debug variables for pumps and minersRichard Hendricks
2020-02-15removed unused importsDream-Master
changed subversion to 33
2020-02-08Fixed EndSteelDaniel
2020-02-08Added EndSteelDaniel
2020-01-03Can't breed firestone bees #5271Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/5271
2020-01-03Nikolite & Miner Fixes (#230)bartimaeusnek
+ Fixed gt recipes not working for Electrotine + Fixed Miner loading with "0" chunks when placed down + Version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2019-12-28Chunkloading support for multiblock miner (#227)repo-alt
* WIP, doesn't do anything yet, up to RFC * Initial attempt at Chunk manager * Added chunkloading support to multiblock miner. * moved basic miner-independent chunkloading-related stuff up tier, to be more reusable Co-authored-by: Richard Hendricks <richardhendricks@pobox.com>
2019-12-10tin item pipe not harvestable #5156Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/5156 set Steel Level from 2 to 3 (cherry picked from commit 3af81d216633df4c0782a086fc8f9374184a9958)
2019-10-30revert redstone hardness. Otherwise no on can crash it with a lv 2 hammer.Dream-Master
(cherry picked from commit 5f63f6b0a3668ec869c6ed283d6a371f55448f5a)
2019-10-29update durability to mine Redstone and Diamonds after making bronze tools.Dream-Master