Commit graph

18 commits

Author SHA1 Message Date
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
530a334bb1 Fix Nitric Acid name #1079 2017-06-06 15:32:06 +02:00
Johannes Gäßler
8ac41d3c3c Chem reactors can now output 2 items, implemented recipes for Nitric
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-30 01:36:10 +02:00
Techlone
b2157c6320 Add new semiconductors and indium recipe 2017-02-17 23:45:56 +05:00
Blood-Asp
82b97af85e Naquadah gen mk3 now uses cells with molten naquadah instead of dust 2016-12-23 14:27:42 +01:00
Blood-Asp
f3f90f699b Fix Food Can recipes 2016-12-17 18:16:37 +01:00
Dimach
b1c2cbe935 Fixed #767. 2016-11-28 22:05:42 +02:00
Blood-Asp
dc56e5ef44 Immersive Engineering compatibility and more fuels in generators 2016-10-22 13:04:50 +02:00
Blood-Asp
b48613dc7d Add EnderIO Rocket Fuel compat 2016-10-19 00:37:48 +02:00
Muramasa
009709462e TryCatch changes 2016-08-13 10:10:11 +01:00
Muramasa
0345ada52c Remove null checks 2016-08-13 09:10:38 +01:00
DEMOOH
a5ba9e57fa Update GT_FuelLoader.java
Changed MK3 Naquadah Reactor to return naquadah cell instead of empty cell.
2016-07-24 15:32:26 +03:00
Blood-Asp
259ef97c7c Fix some wrong stone processing 2015-12-15 23:09:34 +01:00
Blood-Asp
a7c9f96647 fix thaumium block overwritten, cable error without RF api and cells getting eaten 2015-12-10 15:04:23 +01:00
Blood-Asp
8176a5fca9 cable burn fix and ihl compat fix 2015-12-08 23:39:41 +01:00
Shawn Buckley
9353aa711b Reformat code 2015-10-21 22:06:25 -04:00
Shawn Buckley
c68e84f1e2 Remove jdgui-comments 2015-10-21 21:11:56 -04:00
Shawn Buckley
1185424fa7 Move source files 2015-10-21 20:46:52 -04:00