aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
AgeCommit message (Collapse)Author
2018-07-16[Suggestion] Change Circuit Assembler "processing" GUI to avoid confusion ↵Dream-Master
with Assembler #3274
2018-06-30added some Main Branch PRsbartimaeusnek
https://github.com/Blood-Asp/GT5-Unofficial/pull/1468/ https://github.com/Blood-Asp/GT5-Unofficial/pull/1462 https://github.com/Blood-Asp/GT5-Unofficial/pull/1452/
2018-06-20New feature for chestbuffers/superbuffers:Transfer size mode. Instead of ↵Richard Hendricks
matching the output inventory, this mode will only transfer fixed sizes to output invetory. Useful for input hatches to Amazon Packager or PA filled with packagers.
2018-05-19nuclear control displays 2.0, lang file addition (#120)bartimaeusnek
* +applied mitchej123 fix to all turbines +added .lang translation for GUI +removed error log for quicksilver dust * Lang file for Multiblock Information Nuclear Display patch * Tin Cell dublicate bug https://github.com/GTNewHorizons/NewHorizons/issues/2970
2018-04-21fix localizer derpDream-MasterXXL
2018-04-21Add localizer for NeiDream-MasterXXL
fix a few recipe deps and descriptions.
2018-04-20added new UHV machine parts.Dream-MasterXXL
2018-03-24add textures for fluid regulators LuV-UVDream-Master
2018-03-09change gt localizer DD Dim Ore Spawn Text #2492Dream-Master
i catch not all but Ore Plugin will help
2018-02-26+added achievement for Stargate-Radiation-Containment-Plate,Stargate ↵LOKKO12
Chevron,Stargate Frame Part
2018-01-22Arsenic/Bismuth/Antimony Ore Vein on Mercury #2484Dream-MasterXXL
2017-12-25lang Typo fixesDream-Master
2017-12-22cherry pickDream-Master
Commit: 98f156335aabd7ad79288fd795970ee06c86e6e5 [98f1563] Merge pull request #1306 from YoungGT/unstable Update language files With cz language file i need help
2017-11-13GT6 styled pipesAntifluxfield
2017-10-22Questing issues #2115Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/2115
2017-10-07more localizerDream-Master
2017-10-07add localizer Tec Tech to GTDream-Master
2017-09-12cherry pickDream-Master
3f74245a5b7a7da7b713d21477bf269a5f6d0a30 Can‘t get achievement #1208 https://github.com/Blood-Asp/GT5-Unofficial/issues/1208
2017-09-04forgot about the graphicsDream-Master
2017-09-04cherry pickDream-Master
820b335d831f60e1936c462d0cb8e7dba3c13fae 733d77481757b6b1619408ea6f4766f770b45419 e2017c72c30c4eac9fff231482da660b7eccd370 147101ff6cfb6bc2a0d8a46bad8aa77c943b7429 612cece6299ed698146d041d1277b52fa6e65df1 820b335d831f60e1936c462d0cb8e7dba3c13fae Add new zpm and uv battery #1147
2017-08-13Adding the UHPIC waferDream-Master
2017-08-13Add UHPIC chip for Transformers >uvDream-Master
2017-08-09fix shape graphicsDream-Master
2017-08-09Add new Mold and shape forms for small Gear and Turbine BladesDream-Master
2017-08-08Crafting suggestion #1807Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1807
2017-08-01Cherry pickDream-Master
Commit: 83d64e5d52bce00107b80ba97285307aa6e5969f [83d64e5] Added a new Basic Circuit: Microprocessor Produced similarly to the Integrated Processor, but yields 2 Basic Circuits instead of 1 Good Circuit.
2017-08-01cherry pickDream-Master
Commit: 6a1d32e4a3a48b4f7c18e352a4d2efe260994ba8 [6a1d32e] Overhauled the Wetware Circuit recipes They no longer need beer. Also the basic Wetware Processor only needs 1 Wetware Circuit Board.
2017-08-01add pngDream-Master
2017-08-01cherry pickDream-Master
4cda183354d244ba45691149b2754ac3f45d3c8e Added a new Circuit board tier: Plastic Circuit Board
2017-07-19add 6 slots to the mixerDream-Master
2017-07-09changes pngs moldsDream-Master
2017-07-06cherry pickDream-Master
424b356feeb02cb3735b928b4b16fdf54631bcae 835dd2daccc5894a40b75a2110911a8c3e1878b9 98e214b873840c97778bb5bf5377673f76fd457d 0334a19993931a421376ce3aad50191edff3814b 0375e11debad5b9c997a91da3d07f85e37dc0616 480132b25f85bb350b04e949174ebc9ade85f185 Added LV and MV miners. #1142
2017-07-02cherry pickDream-Master
Assembly line upgrade #1130 @Antifluxfield can you review this changes. Thanks
2017-07-02cherry pickJohannes Gäßler
Item Distributor #1132
2017-06-25change picDream-Master
2017-06-23Add new Circuit PartsDream-Master
2017-06-19Merge remote-tracking branch 'Petrochemy/BrickedBlastFurnace' into ↵Dream-Master
BrickedBlastFurnace
2017-06-17Implemented crafting recipes for the Bricked Blast FurnaceJohannes Gäßler
fixed Glass Hammering consuming 40x more energy than intended Fixed Hammer recipes that (presumably unintentionally) had 10EUt, 16 ticks instead of 16EUt, 10 ticks. Renamed Dense Bricks -> Firebricks
2017-06-17Merge branch 'unstable_BLOOD' into reMergeTechnus
# Conflicts: # src/main/java/gregtech/api/enums/ItemList.java # src/main/java/gregtech/api/enums/Textures.java # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-17Merge pull request #1074 from Techlone/advminer2_improvementsBlood-Asp
AdvMiner2 renamed; new tiers of OreDrillingPlant
2017-06-17Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' intoJohannes Gäßler
BrickedBlastFurnace Conflicts: src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/api/enums/Textures.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-16Adjusted BBF GUIs to accommodate to the new 3/3 layout.Johannes Gäßler
2017-06-15Merge remote-tracking branch 'origin/unstable' into ChemistryUpdateJohannes Gäßler
Conflicts: src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java src/main/java/gregtech/loaders/load/GT_FuelLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
2017-06-14cherry pickDream-Master
1b753d3528c7a149c23838eb3c4ce0d8f55036a6 Reworking DataOrb and DataStick
2017-06-13Reworking DataOrb and DataStickTechlone
2017-06-08Implemented Bricked Blast Furnace, added corresponding texturesJohannes Gäßler
Added a new Casing for the Bricked Blast Furnace, GT_Block_Casings4, ID 15 Refactored the non-electric Blast Furnaces: The Bronze Blast Furnace and the Bricked Blast Furnace extend a superclass to ensure consistent behavior. Subclasses only differ in texture, description, and Casing Block.
2017-06-07Merge branch 'unstable' into advminer2_improvementsTechlone
# Conflicts: # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
2017-06-07add Oilcracker Gui with two visual input slotsDream-Master
2017-06-06Oil Cracking Update from Johannes GaesslerDream-Master
2017-06-06cherry pick: from TechloneDream-Master
7cb51ae461815bfd767aa0bf64f8ff075de5624d c5402ee38998cc086ceb36fbce6c54aba6d9d79c 7c48590a49242bb26eddafa26d2cd7b4ce3546d8 75a33be210cda273ef9e6cc9cbbf739dd913907e b187410005771f1762f3bb5c94c0c5cd26dd06db