modmuss50 d267bb4e09 Merge remote-tracking branch 'origin/1.12' into 1.12		2017-07-10 18:33:07 +01:00
..
api	Fix rollingmachine closes #1174	2017-07-02 18:12:57 +01:00
blocks	Fixes #1178	2017-07-03 19:48:21 +01:00
client	Draw default background on GUI's might help fix some issues	2017-06-29 13:11:59 +01:00
command	Add Pyrotheum to fluid gen + clean up fluid handling, closes #1054	2017-07-07 00:02:14 +01:00
compat	Add Pyrotheum to fluid gen + clean up fluid handling, closes #1054	2017-07-07 00:02:14 +01:00
config	Fixed grammar (#1192)	2017-07-09 13:13:15 +01:00
dispenser	Remove a few old configs	2017-06-09 10:35:54 -07:00
entities	1.12	2017-06-11 21:22:07 +01:00
events	Auto format code	2017-06-28 20:54:12 +01:00
init	Should fix crash with industrial foregoing	2017-07-10 18:32:34 +01:00
itemblocks	Fixes issue with cable crafting, #betaBuild	2017-06-22 20:27:05 +01:00
items	Added a generous amount of recipes into thermal expansion, close #1110	2017-07-06 23:49:00 +01:00
lib	Update to support forge model changes, #releaseBuild	2017-06-25 13:56:39 +01:00
multiblocks	Added license info to the header of all files.	2017-02-23 12:29:43 +00:00
packets	Auto format code	2017-06-28 20:54:12 +01:00
proxies	Fix the rest of the models & remove manual and heat generator	2017-06-16 08:20:30 -07:00
tiles	Fix server kicking client when using the saw mill, closes #1182 #releaseBuild	2017-07-03 21:51:17 +01:00
utils	Fix server start-up crash, #betaBuild	2017-06-18 14:14:42 +01:00
world	Auto format code	2017-06-28 20:54:12 +01:00
Core.java	Update to support reborn core mixin changes.	2017-06-26 23:00:43 +01:00