Commit graph

160 commits

Author SHA1 Message Date
Robert S
9b86de1bce Moved damage prefabs to core 2014-03-25 14:41:34 -04:00
Calclavia
5cf5b41dc1 Merge branch 'development' of https://bitbucket.org/calclavia/resonant-induction into development
Conflicts:
	src/main/scala/resonantinduction/core/ResonantInduction.java
	src/main/scala/resonantinduction/core/resource/ResourceGenerator.java
2014-03-25 21:10:46 +08:00
Calclavia
bdf8b146ec Added ability to use normal dust as a dust block for smelting 2014-03-25 21:03:45 +08:00
Robert S
e7e2768d19 Fixed block IDs for fluids not showing up in configs 2014-03-25 08:31:51 -04:00
Robert S
ea176da493 Fixed NPE if fluid blockID is null when using a fluid bucket 2014-03-25 08:13:12 -04:00
Robert S
6c93020dea Implemented a few more configs for resource generator 2014-03-25 08:03:40 -04:00
Calclavia
e58c5209d4 Resolved #485 - Refined dust now registers as dust 2014-03-25 19:39:53 +08:00
Robert S
e6d0cc5319 Created a config to disable the ore generator in total 2014-03-25 07:34:42 -04:00
tgame14
de0421dba0 Removing override in fluidpressurenode 2014-03-24 19:15:13 +02:00
Calclavia
90a85e7dcb Moved everything to scala folder 2014-03-23 17:19:47 +08:00