aboutsummaryrefslogtreecommitdiff
path: root/src/main
AgeCommit message (Collapse)Author
2020-04-10remove archivents from ore drill V and VIDream-Master
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-09change oredrill recipes and oil drill recipesDream-Master
2020-04-09fix archivementDream-Master
ore drill 5 and 6
2020-04-09put all Oil and oredrill recipes to Assembler/asslineDream-Master
2020-04-07change Texture of the Ore drill casings a bitDream-Master
2020-04-07Merge branch 'Ore-Drilling-T5+T6' of ↵Technus
https://github.com/GTNewHorizons/GT5-Unofficial into Ore-Drilling-T5+T6 # Conflicts: # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant5.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant6.java
2020-04-07Set textures and adjust casing block register rangeTechnus
2020-04-07change textur id of ore drillsDream-Master
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-06Move to proper id's out of GT++ space... but they are still unused on ↵Technus
hatches... so does not really matter... (cherry picked from commit 880f24355b6afbc860dc28a66c9f660f2b5610d8)
2020-04-06Move to proper id's out of GT++ space... but they are still unused on ↵Technus
hatches... so does not really matter...
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-06fix textureDream-Master
fix tier from ore drill tier 6 bump version
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-23no messageJason Mitchell
2020-03-23Fix replicator race condition (#255)Jason Mitchell
2020-03-23First attemp to add Ore drilling Plant Luv and ZPMDream-Master
2020-03-22reverse commitDream-Master
(cherry picked from commit c759ae1b05589b411a603ffd2efa2c33b327540c)
2020-03-22reverse commitDream-Master
2020-03-22IC2 Charging Packs #5791Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/5791 (cherry picked from commit 76e8245d1c6f5a843eb04a6314f8b4ee75e45433)
2020-03-22IC2 Charging Packs #5791Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/5791
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-21fixed https://github.com/GTNewHorizons/NewHorizons/issues/5787repo_alt
updated AE2 dependency to use rv3 API
2020-03-19Merge branch 'experimental' into Very-ExperimentalDream-Master
2020-03-19Merge pull request #251 from GTNewHorizons/RefactorMartin Robertz
Refactor
2020-03-19Add cover information on the machine item tooltip. (#252)Johnson
* Add cover information on the machine item tooltip.
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>
generated by cgit (git 2.46.0) at 2025-03-05 20:03:39 +0000