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

438 commits

Author SHA1 Message Date
Antifluxfield
04058ef4e4 Update GT_MetaTileEntity_Hatch_DataAccess.java 2017-06-30 06:28:46 +08:00
Antifluxfield
fa486fcd56 Update ItemList.java 2017-06-30 06:19:38 +08:00
Antifluxfield
348c6b801c Update GT_MetaTileEntity_Hatch_DataAccess.java 2017-06-30 06:18:30 +08:00
Antifluxfield
cf9d888745 Update GT_GUIContainer_1by1.java 2017-06-30 06:11:42 +08:00
Antifluxfield
44ad1bcb96 Update GT_GUIContainer_2by2.java 2017-06-30 06:11:18 +08:00
Antifluxfield
08d45ae407 Update GT_GUIContainer_3by3.java 2017-06-30 06:10:31 +08:00
Antifluxfield
94bf4937d8 Update GT_GUIContainer_4by4.java 2017-06-30 06:09:28 +08:00
Antifluxfield
a2bd69d2da Delete GT_GUIContainer_DataAccess.java 2017-06-30 06:08:28 +08:00
Antifluxfield
81b91a3d7e Update GT_MetaTileEntity_MultiBlockBase.java 2017-06-30 05:45:37 +08:00
Antifluxfield
37d8191bdc Update GT_MetaTileEntity_MultiBlockBase.java 2017-06-30 05:17:12 +08:00
Antifluxfield
1a78d7f315 Update GT_MetaTileEntity_Hatch_DataAccess.java 2017-06-30 04:48:28 +08:00
Antifluxfield
dd1f4f7a3e Create GT_GUIContainer_DataAccess.java 2017-06-30 04:47:21 +08:00
Antifluxfield
5294b864bd Update GT_MetaTileEntity_Hatch_DataAccess.java 2017-06-30 04:24:45 +08:00
Antifluxfield
5995a20bb6 Check for DataItems 2017-06-30 03:52:51 +08:00
Antifluxfield
41a0e6d8a0 Make Data Access Hatch a MultiBlock part 2017-06-30 02:49:39 +08:00
Antifluxfield
ac74f55c2a Adding Data Access Hatch 2017-06-30 01:33:37 +08:00
Antifluxfield
d6625b0431 Adding Data Access Hatch 2017-06-29 12:31:50 -05:00
Johannes Gäßler
4061f8f397 Corrected Plutonium Isotope: 244 -> 239 2017-06-27 09:33:35 +02: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
Johannes Gäßler
18f5945d80 Merge branch 'OilRefining' into unstable 
Conflicts:
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
 2017-06-25 23:34:30 +02:00
Technus
6abdc95c0c Optimize imports - intelliJ one button action 2017-06-25 12:09:46 +02:00
Technus
9beb1b5b31 Assline recipes part1 2017-06-25 11:42: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
c0c498fb8c Added Bricked BF config, fixed Primitive BF class hierarchy 
Blast Furnace Recipes using Coal or Charcoal now yield Dark Ash instead
of Ash.
 2017-06-23 23:48:38 +02:00
Johannes Gäßler
41b93ae85d Fixed several Material formulas 
RedAlloy, TungstenCarbide now have the correct formula.
Changed the formula of Lignite, it no longer contains Ash

Fixed the algorithm for determining whether or not to put brackets
around a partial Material.
 2017-06-23 00:54:16 +02:00
Johannes Gäßler
14b9332d14 Moved the Casings for the Large Chemical Reactor again. 
As it turns out overwriting Casings 4.4 and 4.5 was not a good idea
because even though there is no actual Casing at those IDs, the textures
are in use.

I started a new batch of Casings (GT_Block_Casings8) at IDs 112-127.
I did not use IDs 80-95 because there seem to already be some textures
there.
I did not use IDs 96-111 because they seem to already be in use by
Technus.
 2017-06-22 01:50:21 +02: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
Blood-Asp
b588e82ef7 Fix buffer and regulator RS signals 2017-06-16 01:40:16 +02:00
Blood-Asp
a1e3a8161e Hitboxes when holding soldering iron #1095 2017-06-15 23:52:32 +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
Blood-Asp
911a807529 pollution smog 2017-06-14 23:51:39 +02:00
Johannes Gäßler
7f408ff581 Returned BioFuel to its previous state, added BioDiesel instead. 
There are artifacts for fluids called BioFuel, therefore the change.
 2017-06-14 23:15:31 +02:00
Blood-Asp
e6de8921c0 fix for timber changes 2017-06-14 01:30:36 +02:00
Blood-Asp
9447eea43b why does the client crash when using isClientSide() ??? 2017-06-14 01:02:49 +02:00
Blood-Asp
61d17d250d quickfix for server side crash 2017-06-14 00:00:58 +02:00
Blood-Asp
4ac668066b missed one file 2017-06-13 22:50:19 +02:00
Blood-Asp
699ea26ba4 Attempt to fix not accepting fluids after fluidmapchange. #1081 #577 ect. 2017-06-13 22:41:15 +02:00
Blood-Asp
3caab8d4ff Fix translation of covers 2017-06-13 21:48:10 +02:00
Blood-Asp
9209d0843f Port GT6 timber changes 2017-06-13 18:58:18 +02:00
Blood-Asp
ead3fa6ad7 meh... 2017-06-13 18:57:05 +02:00
Techlone
1b753d3528 Reworking DataOrb and DataStick 2017-06-13 20:52:53 +05:00
Blood-Asp
e85a761e82 At last one free face. 2017-06-12 13:48:54 +02:00
Blood-Asp
ef22bf6ab9 Only open machine gui if front is free. 2017-06-12 12:18:54 +02:00
Blood-Asp
8e043d00d9 Cables and pipes now change hitboxes dynamicly depending on connections or covers 2017-06-12 11:58:26 +02:00