aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
AgeCommit message (Collapse)Author
2017-09-12Merge pull request #1203 from YoungGT/unstableBlood-Asp
Update zh_CN.lang
2017-09-10Update zh_CN.langYoungGT
2017-09-10Update zh_CN.langYoungGT
2017-09-10Update zh_CN.langYoungGT
2017-09-05Update zh_CN.langYoungGT
2017-09-04Update zh_CN.langYoungGT
2017-09-03Merge branch 'unstable' into CircuitChemistryUpdateFollowupBlood-Asp
2017-07-31Added a new Basic Circuit: MicroprocessorJohannes Gäßler
Produced similarly to the Integrated Processor, but yields 2 Basic Circuits instead of 1 Good Circuit.
2017-07-31Overhauled the Wetware Circuit recipesJohannes Gäßler
They no longer need beer. Also the basic Wetware Processor only needs 1 Wetware Circuit Board.
2017-07-26Overhauled Fiberglass Circuit BoardJohannes Gäßler
Renamed: Fiberglass Circuit Board -> Fiber-Reinforced Circuit Board Fiber-Reinforced Boards are now made by combining Epoxy Resin with either Glass Fiber or Carbon Fiber. Glass Fiber is produced from Borosilicate Glass, which is in turn produced from Glass and Boron. To make this feasible Salt and Rock Salt now yield Borax as a byproduct.
2017-07-25Added a new Circuit board tier: Plastic Circuit BoardJohannes Gäßler
2017-07-17add config EnableZPMandUVBatteries default falseSLiMylya
2017-07-09update changeSLiMylya
2017-07-08add achievementsSLiMylya
2017-07-08add icon batterySLiMylya
2017-07-06Merge pull request #1132 from JohannesGaessler/ItemDistributorBlood-Asp
Item Distributor
2017-07-06Added LV and MV miners.Dimach
2017-07-01Added GUI classes for the Item Distributor, fixed EU IO logicJohannes Gäßler
2017-06-30Added a new texture for the Item DistributorJohannes Gäßler
2017-06-29Add files via uploadAntifluxfield
2017-06-29Add files via uploadAntifluxfield
2017-06-30Delete DataAccess.pngAntifluxfield
2017-06-29Add files via uploadAntifluxfield
2017-06-26Merge branch 'unstable_blood' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/api/enums/MaterialBuilder.java src/main/java/gregtech/common/GT_RecipeAdder.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-25Merge branch 'BrickedBlastFurnace' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/GT_Mod.java src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/common/GT_Proxy.java src/main/java/gregtech/common/blocks/GT_Block_Casings4.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-25Add GUI assetTechnus
2017-06-25Assline recipes part3Technus
2017-06-25Revert "NEI GUI AssemblyLine"Daniel
2017-06-24NEI GUI AssemblyLineSLiMylya
2017-06-18Merge remote-tracking branch 'origin/unstable' into OilRefiningJohannes Gäßler
Conflicts: src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-18Merge branch 'ChemistryUpdate' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/api/enums/ItemList.java src/main/java/gregtech/api/enums/Textures.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
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 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-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-05Added Rape Crop as a new source of Seed OilJohannes Gäßler
2017-06-04wire/pipe hiding/reduced sizeTechnus
2017-06-03Increased the input slots of the assembler from 2 to 6.Johannes Gäßler
2017-06-01Fix OreDrill; fix getting block in ItemList; some changes in addInformation ↵Techlone
- need check this
2017-06-01AdvMiner rewriting; now it's Ore Drilling PlantTechlone
Four tiers of Ore Drilling Plant I - radius is 3 chunks MV+ (default) II - radius is 4 chunks HV+ III - radius is 6 chunks EV+ IV - radius is 9 chunks IV+ New behavior: - pick pipes after mining finish - extract ore block before moving down
2017-05-16Changed the NEI GUI of the Distillation Tower to show up to 12 outputs.Johannes Gäßler
Also added a currently unused GUI for 9x9 recipes.
2017-05-15Added a GUI for the Large Chemical ReactorJohannes Gäßler
2017-05-12Merge branch 'ChemistryUpdate' into LargeChemicalReactorJohannes Gäßler
Conflicts: src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-05-09Added new textures for the LCM, using them nowJohannes Gäßler
2017-04-30Chem reactors can now output 2 items, implemented recipes for NitricJohannes Gäßler
Acid,added utility methods to get Material cells or integrated circuits, it's now possible to declare a temperature for automatically created fluids / gases
2017-04-01Updated Achievements to fit changed circuitsBlood-Asp
generated by cgit (git 2.46.0) at 2025-03-12 14:22:23 +0000