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

1513 commits

This branch
This branch
All branches
Author SHA1 Message Date
Antifluxfield
53ca200a2e Make Data Access Hatch part of AssLine 2017-06-30 02:53:17 +08:00
Antifluxfield
41a0e6d8a0 Make Data Access Hatch a MultiBlock part 2017-06-30 02:49:39 +08:00
Antifluxfield
0dc242d539 Adding Data Access Hatch 2017-06-30 01:36:30 +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
Dimach
4d471edc8f Done 2017-06-29 19:23:44 +03:00
Antifluxfield
d50682ff7f Player Detector fix #2 2017-06-29 19:03:15 +08:00
Antifluxfield
3e566dc404 Trying to fix #1112 
A simple duct-tape of this issue.
 2017-06-29 17:50:51 +08:00
Antifluxfield
6cc01b71e9 Exchange the message 
Something I've done wrong.
 2017-06-29 17:25:28 +08:00
Antifluxfield
b4e92ac224 Revert the commit 2017-06-29 15:45:47 +08:00
Dimach
c145af0327 Removed divider that already applied in Gt_UndergroundOil. 2017-06-29 06:25:57 +03:00
Johannes Gäßler
6a9e0756d6 Fixed a bug where the Bricked Blast Furnace didn't need a casing. 
I forgot to actually implement checking whether the casing blocks are
Firerick blocks.
 2017-06-29 00:29:06 +02:00
Antifluxfield
241c73e295 Change Back the message 
Something I've done wrong...
 2017-06-29 03:59:45 +08:00
Antifluxfield
1aae3c9fb3 Trying to fix PE polymerizing recipe 
These recipe confilcts with the PE polymerizing recipe with oxygen.
Just add an Integrated Circuit in the recipe.
 2017-06-28 20:49:44 +08:00
Antifluxfield
477e2b5a6d Fixed 2 formulae 
TiC2Cl2 => TiCl4;
HPO4    => H3PO4.
 2017-06-28 08:46:38 +08:00
Johannes Gäßler
40d850aece Added the state of the ItemDistributor to the NBTTadCompound 2017-06-28 00:16:04 +02:00
Johannes Gäßler
4061f8f397 Corrected Plutonium Isotope: 244 -> 239 2017-06-27 09:33:35 +02:00
Johannes Gäßler
95a1d46086 Added configurable weights to the ItemDistributor sides. 2017-06-27 00:44:59 +02:00
Johannes Gäßler
250f280808 Fixed Dual Fuel Rod names, Tungstencarbide, removed some EBF Ash outputs 2017-06-26 21:14:48 +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
eb4768ba0c Fixed typo: Firerick -> Firebrick 2017-06-26 09:05:44 +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
850f30a9d7 Extra fix for: https://github.com/Blood-Asp/GT5-Unofficial/issues/1098 2017-06-25 12:28:11 +02:00
Technus
29c2639e83 Add refreshing code 2017-06-25 12:19:03 +02:00
Technus
4d75aeeafe Add GUI asset 2017-06-25 12:10:10 +02:00
Technus
6abdc95c0c Optimize imports - intelliJ one button action 2017-06-25 12:09:46 +02:00
Technus
bc981df032 Assline recipes part3 2017-06-25 11:52:48 +02:00
Technus
ccc7cf9276 Assline recipes part2 2017-06-25 11:45:35 +02:00
Technus
9beb1b5b31 Assline recipes part1 2017-06-25 11:42:48 +02:00
Blood-Asp
a6ccb120e1 Merge pull request #1117 from Technus/revert-1115-assline 
Revert "NEI GUI AssemblyLine"
 2017-06-25 11:13:11 +02:00
Daniel
b7a339d63e Revert "NEI GUI AssemblyLine" 2017-06-25 10:42:39 +02:00
Johannes Gäßler
22fdaed164 Added simple ItemDistributor implementation, changed MoveOneItemStack 2017-06-25 00:30:59 +02:00
Johannes Gäßler
31516ba891 Created a non-functional first draft of the Item Distributor 2017-06-24 18:08:23 +02:00
Johannes Gäßler
3093ef1b13 Made the Large Chemical Reactor cheaper, added more Cell Materials 
Large Chemical Reactor Circuits: Elite -> Advanced
Inert Machine Casing: Clean Stainless Steel Casing -> Solid Steel Casing

Fluid Cells can now also be made from Steel and Polytetrafluoroethylene

Fixed the name of Plastic and PTFE Fluid Pipes.
 2017-06-24 17:26:57 +02:00
Johannes Gäßler
4b77ca6713 Added more recipes for Carbon Monoxide, Carbon Dioxide, Acetic Acid 2017-06-24 13:59:27 +02:00
Johannes Gäßler
6f3d92f3fa Added a config option for easier EV+ Cables 2017-06-24 11:56:35 +02:00
Blood-Asp
484b45466a Merge pull request #1115 from SLiMylya/assline 
NEI GUI AssemblyLine
 2017-06-24 11:25:42 +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
285c6637dd Fixed NitrationMixture FluidStacks, Glyceryl recipe stocheometry 2017-06-22 10:01:36 +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
368557ca5e Biomass Fermentation: Efficiency 80% -> 100%, Duration 640t -> 150t 2017-06-18 17:34:11 +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
edc857c8a9 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-17 14:38:20 +02:00
Blood-Asp
617f057dad Extended logging for Assemblyline 2017-06-17 14:37:57 +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