Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions
1614 commits 8 branches 203 tags 97 MiB
Commit graph

109 commits

Author SHA1 Message Date
Antifluxfield
c648ac6ef0 Visualize fluid pipe input restriction 2017-10-31 01:39:13 +08:00
Antifluxfield
7b0dc97594 Add Quadruple and Nonuple fluid pipes; fix several issues 2017-10-30 16:16:16 +08:00
Blood-Asp
3f74245a5b Fix #1208 2017-09-12 21:52:31 +02:00
Blood-Asp
88364a5ba1 Merge pull request #1203 from YoungGT/unstable 
Update zh_CN.lang
 2017-09-12 21:10:14 +02:00
YoungGT
c0ca3865b0 Update zh_CN.lang 2017-09-10 20:50:26 +08:00
YoungGT
a6fe06c7f5 Update zh_CN.lang 2017-09-10 20:46:02 +08:00
YoungGT
6eb089d42b Update zh_CN.lang 2017-09-10 20:41:46 +08:00
YoungGT
2eac4d9fa2 Update zh_CN.lang 2017-09-05 06:47:13 +08:00
YoungGT
9c9d915d51 Update zh_CN.lang 2017-09-04 22:19:42 +08:00
Blood-Asp
6df7f36bd9 Merge branch 'unstable' into CircuitChemistryUpdateFollowup 2017-09-03 17:57:34 +02:00
Johannes Gäßler
83d64e5d52 Added a new Basic Circuit: Microprocessor 
Produced similarly to the Integrated Processor, but yields 2 Basic
Circuits instead of 1 Good Circuit.
 2017-07-31 10:10:36 +02:00
Johannes Gäßler
6a1d32e4a3 Overhauled the Wetware Circuit recipes 
They no longer need beer.
Also the basic Wetware Processor only needs 1 Wetware Circuit Board.
 2017-07-31 09:46:57 +02:00
Johannes Gäßler
54fc4e222a Overhauled Fiberglass Circuit Board 
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-26 21:50:09 +02:00
Johannes Gäßler
4cda183354 Added a new Circuit board tier: Plastic Circuit Board 2017-07-25 17:42:52 +02:00
SLiMylya
820b335d83 add config EnableZPMandUVBatteries default false 2017-07-17 12:56:37 +03:00
SLiMylya
612cece629 update change 2017-07-09 19:36:23 +03:00
SLiMylya
147101ff6c add achievements 2017-07-08 14:12:20 +03:00
SLiMylya
733d774817 add icon battery 2017-07-08 14:07:31 +03:00
Blood-Asp
8cfd1ff724 Merge pull request #1132 from JohannesGaessler/ItemDistributor 
Item Distributor
 2017-07-06 22:36:37 +02:00
Dimach
424b356fee Added LV and MV miners. 2017-07-06 06:48:18 +03:00
Johannes Gäßler
baa04cc51b Added GUI classes for the Item Distributor, fixed EU IO logic 2017-07-01 13:01:11 +02:00
Johannes Gäßler
72a7a2a4c3 Added a new texture for the Item Distributor 2017-06-30 23:18:44 +02:00
Antifluxfield
6cb3175e67 Add files via upload 2017-06-29 18:33:10 -05:00
Antifluxfield
110e3905eb Add files via upload 2017-06-29 17:15:49 -05:00
Antifluxfield
9191f46f68 Delete DataAccess.png 2017-06-30 06:15:05 +08:00
Antifluxfield
8058bc3c29 Add files via upload 2017-06-29 15:50:04 -05:00
Johannes Gäßler
ddf58e6ef4 Merge branch 'unstable_blood' into unstable 
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-26 20:25:32 +02:00
Johannes Gäßler
f698d3f8e0 Merge branch 'BrickedBlastFurnace' into unstable 
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-25 23:45:45 +02:00
Technus
4d75aeeafe Add GUI asset 2017-06-25 12:10:10 +02:00
Technus
bc981df032 Assline recipes part3 2017-06-25 11:52:48 +02:00
Daniel
b7a339d63e Revert "NEI GUI AssemblyLine" 2017-06-25 10:42:39 +02:00
SLiMylya
cbefd59741 NEI GUI AssemblyLine 2017-06-24 09:51:59 +03:00
Johannes Gäßler
668ca431a8 Merge remote-tracking branch 'origin/unstable' into OilRefining 
Conflicts:
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
 2017-06-18 17:26:04 +02:00
Johannes Gäßler
337b6fc66d Merge branch 'ChemistryUpdate' into unstable 
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-18 00:17:03 +02:00
Johannes Gäßler
b73a2e0017 Implemented crafting recipes for the Bricked Blast Furnace 
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-17 23:39:51 +02:00
Blood-Asp
909149cd28 Merge pull request #1074 from Techlone/advminer2_improvements 
AdvMiner2 renamed; new tiers of OreDrillingPlant
 2017-06-17 14:37:10 +02:00
Johannes Gäßler
de42d1da42 Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' into 
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-17 01:02:38 +02:00
Johannes Gäßler
fcaefe2d28 Adjusted BBF GUIs to accommodate to the new 3/3 layout. 2017-06-16 23:48:36 +02:00
Johannes Gäßler
34474480f7 Merge remote-tracking branch 'origin/unstable' into ChemistryUpdate 
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-15 12:28:14 +02:00
Techlone
1b753d3528 Reworking DataOrb and DataStick 2017-06-13 20:52:53 +05:00
Johannes Gäßler
6d15192990 Implemented Bricked Blast Furnace, added corresponding textures 
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-08 23:22:08 +02:00
Techlone
86318b7b44 Merge branch 'unstable' into advminer2_improvements 
# Conflicts:
#	src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
 2017-06-07 18:17:23 +05:00
Johannes Gäßler
c7704610c5 Added Rape Crop as a new source of Seed Oil 2017-06-05 16:50:02 +02:00
Technus
c9908ffa98 wire/pipe hiding/reduced size 2017-06-04 09:28:43 +02:00
Johannes Gäßler
8a19bd9fc9 Increased the input slots of the assembler from 2 to 6. 2017-06-03 12:45:20 +02:00
Techlone
75a33be210 Fix OreDrill; fix getting block in ItemList; some changes in addInformation - need check this 2017-06-01 20:23:13 +05:00
Techlone
b187410005 AdvMiner rewriting; now it's Ore Drilling Plant 
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-06-01 00:01:32 +05:00
Johannes Gäßler
856f1bebbf Changed the NEI GUI of the Distillation Tower to show up to 12 outputs. 
Also added a currently unused GUI for 9x9 recipes.
 2017-05-16 22:19:36 +02:00
Johannes Gäßler
8823dc53f8 Added a GUI for the Large Chemical Reactor 2017-05-15 21:08:27 +02:00
Johannes Gäßler
20142f1b10 Merge branch 'ChemistryUpdate' into LargeChemicalReactor 
Conflicts:
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
 2017-05-12 21:12:01 +02:00