aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
AgeCommit message (Collapse)Author
2020-04-10Merge remote-tracking branch 'origin/fixes' into fixesbartimaeusnek
2020-04-10replaced magic numbers with string identifiersbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
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-05Merge pull request #258 from moller21/experimentalMartin Robertz
Display fluid amount in the fluid display stack.
2020-04-05CrudeSteelDaniel
makes GTMaterial match up with EnderIO material
2020-04-05add new Enderi IO materials to GTJason Mitchell
2020-04-05Display fluid amount in the fluid display stack.moller21
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-17Refactored Interfacesbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_Slot_Holo.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_GUIContainerMetaTile_Machine.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_GUIContainer_MultiMachine.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_GUIContainer_BasicMachine.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_GUIContainer_2by2.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_ContainerMetaTile_Machine.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_Container_MaintenanceHatch.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_Container_BasicTank.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_Container_BasicMachine.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored GT_Container.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-17Refactored BlockScanningEvent.javabartimaeusnek
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>
generated by cgit (git 2.46.0) at 2025-03-05 03:02:03 +0000