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

1675 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Johannes Gäßler
a739167c7f Fixed Imp. Compressor Dynamite amount possibly becoming zero 2017-06-17 12:04:33 +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
87db8ee099 Added recipes to obtain IC2 Biogas for use with the IC2 Jetpack 2017-06-16 21:42:23 +02:00
Johannes Gäßler
da83199523 Added Interface classes for the BBF, increased slots to 3/3 2017-06-16 21:26:20 +02:00
Johannes Gäßler
2d8378052b Fixed Salt Water Electrolyzation and Polydimethylsiloxane production. 2017-06-16 20:24:39 +02:00
Blood-Asp
b588e82ef7 Fix buffer and regulator RS signals 2017-06-16 01:40:16 +02:00
Blood-Asp
810e46d753 fix naquadah wafer recipe #1094 2017-06-15 23:58:54 +02:00
Blood-Asp
a1e3a8161e Hitboxes when holding soldering iron #1095 2017-06-15 23:52:32 +02:00
Blood-Asp
650a105e00 Fix hiding of unused ores. #1062 2017-06-15 23:49:16 +02:00
Johannes Gäßler
9da492c2fb Fixed a bug where Distilleries didn't have a solid output slot. 2017-06-15 20:06:10 +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
Johannes Gäßler
c3f2b2b49d Made it so that Pyrolyse Oven recipes are consistent 
Moved Pyrolyse Oven recipes with Charcoal Byproducts, Wood Gas, Wood
Vinegar, or Wood Tar to OreProcessing to ensure that all log types can
be used.
 2017-06-15 10:27:06 +02:00
Blood-Asp
08c75fd813 Improve fog density calculation 2017-06-15 00:28:27 +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
Johannes Gäßler
91fb725a47 Fixed a bug where an Assembler recipe would be added if the output is 
null
 2017-06-14 22:24:31 +02:00
Johannes Gäßler
3cb5ec51cf Fixed Allyl Chloride recipe consuming a Fluid Cell 2017-06-14 22:06:38 +02:00
Blood-Asp
6b4b32200d fix IC Classic compat #1090 2017-06-14 20:47:42 +02:00
Blood-Asp
b15f0d2c0b Merge pull request #1091 from draknyte1/unstable 
Made the Cleanroom optional.
 2017-06-14 13:47:08 +02:00
Draknyte1
d1eea59fe7 Made the Cleanroom optional. 
This disables the Low Grav option if the Cleanroom is disabled.
 2017-06-14 18:55:26 +10:00
Blood-Asp
96b1cb31ce improve cleanroom tooltip 2017-06-14 02:16:18 +02:00
Blood-Asp
e6de8921c0 fix for timber changes 2017-06-14 01:30:36 +02:00
Blood-Asp
c397df4523 make reinforced blocks prevent monsterspawns 2017-06-14 01:19:56 +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
e30a5694ff wood plank compressor recipe #1013 2017-06-13 23:10:49 +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
Blood-Asp
c665b14e22 Merge pull request #1088 from Techlone/reworking_dataorb 
Reworking DataOrb and DataStick
 2017-06-13 18:55:33 +02:00
Techlone
156bb2b06b Tooltips changing 2017-06-13 21:09:48 +05:00
Techlone
1b753d3528 Reworking DataOrb and DataStick 2017-06-13 20:52:53 +05:00
Techlone
c8a8687a72 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-13 17:44:23 +05:00
Techlone
bfd3ff4b19 Merge branch 'unstable' of https://github.com/Techlone/GT5-Unofficial into unstable 2017-06-13 17:44:13 +05:00
Blood-Asp
e85a761e82 At last one free face. 2017-06-12 13:48:54 +02:00