Commit graph

3883 commits

Author SHA1 Message Date
tgame14
9e7a346406 Added EnumDistributorMode to distinguish between variable modes, Moved TileDistributor to its own Package and Added Functional inventory Scanning and handling, not to be activated till 1.7 2014-03-25 19:43:38 +02: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
Calclavia
d64953fc04 Fixed turntable wrong icon 2014-03-25 19:37:12 +08:00
Robert S
e6d0cc5319 Created a config to disable the ore generator in total 2014-03-25 07:34:42 -04:00
Calclavia
59f98499a9 Merge branch 'development' 2014-03-25 19:33:15 +08:00
Calclavia
8aa2488821 Fixed Calclavia Core wrong Maven repo 2014-03-25 19:33:08 +08:00
Calclavia
bc941a98b9 Merge branch 'development' 2014-03-25 19:30:39 +08:00
Robert S
2b4bac211d Minor refractor/cleanup on belts 2014-03-24 22:50:53 -04:00
Robert S
e5d68fb593 Minor performance improvement in belts 2014-03-24 20:38:33 -04:00
tgame14
9a5f6147d1 Revert "Temporarily disabling TileTurntable to allow compilation"
This reverts commit 91316a7320.
2014-03-24 20:17:32 +02:00
tgame14
8423f9a92c Revert "Commented out Faulty import"
This reverts commit 22c50c0c75.
2014-03-24 20:17:26 +02:00
tgame14
22c50c0c75 Commented out Faulty import 2014-03-24 19:52:37 +02:00
tgame14
91316a7320 Temporarily disabling TileTurntable to allow compilation 2014-03-24 19:50:24 +02:00
tgame14
cb4a93921f Possible fix for super calls erroring 2014-03-24 19:46:33 +02:00
tgame14
3845ba49c4 Fixed errorous super call 2014-03-24 19:43:24 +02:00
tgame14
c23cc19271 Fixed a few more errors 2014-03-24 19:35:09 +02:00
tgame14
ef24842512 Fixing a few Scala derps in TileTurntable 2014-03-24 19:25:47 +02:00
tgame14
de0421dba0 Removing override in fluidpressurenode 2014-03-24 19:15:13 +02:00
Calclavia
1bbfb89a30 Fixed #477 - Solar panel now efficiently use ISBRH connected texture renderer 2014-03-24 21:33:23 +08:00
Calclavia
fc5af14ff0 Fixed #471 - Gutter not searching all possible gutters for fluid flow in 2014-03-24 21:10:49 +08:00
Calclavia
cf6d3cdb30 Fixed breaker and placer textures and rotations 2014-03-24 20:49:52 +08:00
Robert S
296dc1422b Fixed a NPE with tank renderer 2014-03-24 07:31:22 -04:00
Calclavia
3791924480 Fixed tank glass not rendering 2014-03-23 20:19:24 +08:00
Calclavia
90a85e7dcb Moved everything to scala folder 2014-03-23 17:19:47 +08:00
Calclavia
30e1b0c1bb Fixed tgame trying to give traits constructor 2014-03-23 11:00:00 +08:00
Calclavia
da1164afed Fixed pipes not transfering up and down properly 2014-03-23 10:51:59 +08:00
Calclavia
e4c86baf0b Fixed #476 - Trying to load renderer server side 2014-03-23 09:44:12 +08:00
Calclavia
02cf4dd618 Merge branch 'development' of https://bitbucket.org/calclavia/resonant-induction into development
Conflicts:
	archaic/src/main/java/resonantinduction/archaic/fluid/tank/TileTank.java
2014-03-22 23:41:02 +08:00
Calclavia
15ed126fed Updated CalCore 2014-03-22 23:40:20 +08:00
tgame14
1e13e4c709 Adding TileDistributor(tm) non functional 2014-03-22 17:22:48 +02:00
tgame14
834349a3c3 Fix import for TileTank 2014-03-22 17:10:32 +02:00
Calclavia
82382bfd54 Fixed minor tank z-fighting and optimized render 2014-03-22 14:39:34 +08:00
Robert S
620848f4e7 Added basic animation and sound to block breaker 2014-03-22 02:10:17 -04:00
Robert S
170f46b3a9 Added item insert support for block placer 2014-03-22 00:52:26 -04:00
Calclavia
58e11935a4 Block placer and now place almost anything 2014-03-21 21:09:02 +08:00
Robert S
7a54f36ee1 Fixed block breaker delay 2014-03-21 07:46:22 -04:00
Robert S
5bae138f51 Changed block placer and breaker to support full rotation 2014-03-21 06:19:59 -04:00
Calclavia
e159f2466b Fixed placer textures 2014-03-21 17:41:30 +08:00
tgame14
2e3630299c removed derp import of Archaic in Mechanical module 2014-03-21 09:59:13 +02:00
tgame14
ac5df54dbd changed a bit Item Railing connection logic, and added Recipes for Block placer and Breaker for mallrat208 2014-03-21 09:57:00 +02:00
Robert S
b4e46d7104 Fixed gutters drain source blocks, includes preventing drain blocks when only filling 1mb 2014-03-21 00:39:20 -04:00
Robert S
e57004a6fd Implemented gravity in pipes when there is no pressure 2014-03-21 00:14:05 -04:00
Robert S
1a816899d0 Fixed block placer not saving auto pull state 2014-03-20 23:19:10 -04:00
Robert S
02118497f9 Added textures for block placer 2014-03-20 22:28:01 -04:00
Robert S
5814bf48b2 Fixed wrench rotating and changing auto pull for block placer 2014-03-20 21:38:39 -04:00