modmuss50
fc2c4cce0c
Merge remote-tracking branch 'origin/1.12' into 1.12
2018-05-17 10:59:00 +01:00
modmuss50
ffa9e7b5eb
Fix #1516
2018-05-17 10:58:53 +01:00
drcrazy
c10c06260b
Fixed excessive energy usage to charge RF items
2018-05-17 03:43:58 +03:00
drcrazy
29b886ea8d
Fixed unchecked warning
2018-05-17 03:41:19 +03:00
modmuss50
8cf66a7f1d
#releaseBuild
2018-05-16 17:31:18 +01:00
modmuss50
49a06b6044
Merge remote-tracking branch 'origin/1.12' into 1.12
2018-05-16 17:27:52 +01:00
modmuss50
72c8c6252a
Add a config to disable sawmill recipes
2018-05-16 17:27:44 +01:00
drcrazy
134198c948
Updated i18n usage.
2018-05-14 12:24:44 +03:00
drcrazy
3d2cbe4e74
Updated IC2 and BC versions
2018-05-11 15:00:16 +03:00
drcrazy
185d84c904
Added JEI support for assembly machine. Closes #1512
2018-05-10 18:32:11 +03:00
modmuss50
bcc9e0827a
#releaseBuild
2018-05-09 17:53:05 +01:00
drcrazy
ed9cdc7353
GUI update for assembly machine. Some work for #1512
2018-05-08 18:05:49 +03:00
drcrazy
7bc792fd69
Fixed license. )
2018-05-08 17:08:41 +03:00
modmuss50
2b216ee183
Register recipes later, mainly just a test
2018-05-08 13:35:25 +01:00
modmuss50
4a7be6844a
#releaseBuild
2018-05-06 12:41:08 +01:00
modmuss50
3d4432a877
Add grinder and extractor recipes for ic2 tin cans, closes #1508
2018-05-06 12:38:40 +01:00
modmuss50
22f0b74f76
Remove rolling machine recipe transfer as it was broken
2018-05-06 12:15:09 +01:00
modmuss50
36e934ae6a
Fix typo in OC driver
2018-05-06 12:10:55 +01:00
modmuss50
c6d8a8abcb
Industrial Grinder now makes Coal instead of Pulverized Coal, Closes #1511
2018-05-06 12:09:45 +01:00
modmuss50
4c192ec1e8
Add Immersive Engineering Creosote to semi-fluid generator
2018-05-06 12:01:15 +01:00
modmuss50
1c10c199ae
Fixes some issues with the storage chests, closes #1481
2018-05-04 12:06:40 +01:00
drcrazy
9a6d9765bd
Removed tesla dependency.
2018-05-04 12:01:00 +03:00
Modmuss50
e1276a821b
Update to use new discord link
2018-04-30 18:30:09 +01:00
modmuss50
d729cacc4a
Tweak rubber plantation loot table
2018-04-30 14:49:01 +01:00
modmuss50
883a0d0b8b
Fix cells not working with thermal expansion tanks, closes #1504
2018-04-30 14:43:09 +01:00
modmuss50
e87f5fa27e
Fix #1503
2018-04-30 14:24:21 +01:00
modmuss50
07ffd97e92
Add rubber plantation to villages
2018-04-30 13:38:41 +01:00
modmuss50
790c363c03
Remove last direct GL class
2018-04-28 19:46:15 +01:00
modmuss50
c9240f89d0
#releaseBuild
2018-04-28 19:26:19 +01:00
modmuss50
a42e6fea07
Fix #1500
2018-04-28 19:22:43 +01:00
modmuss50
21fc0fe309
#releaseBuild
2018-04-28 12:07:53 +01:00
modmuss50
63b3b0836f
Fix #1497
2018-04-28 11:53:59 +01:00
drcrazy
45669e8aa9
Formatting + set proper frame drop for advanced machines
2018-04-28 13:16:50 +03:00
drcrazy
649a6bf67f
More sorting work.
2018-04-27 18:15:56 +03:00
drcrazy
de61d24082
Sorted out blocks between tiers
2018-04-27 18:06:57 +03:00
drcrazy
97e8fd7270
Changed names for parameters in createTE.
2018-04-27 17:54:19 +03:00
drcrazy
ebd75d2cf1
This is an actual CT support for fluid replicator.
2018-04-27 15:11:19 +03:00
drcrazy
be52e991a7
This should be a CT support for fluid replicator
2018-04-27 15:01:46 +03:00
drcrazy
6e02bb8153
Added more recipes for fluid replicator.
2018-04-27 01:16:16 +03:00
modmuss50
dc32c9505d
Nerf the fusion reactor a little.
2018-04-25 16:17:38 +01:00
drcrazy
9d0a2a0ddc
Added creosote to semifluid generator. Closes #1498
2018-04-25 11:27:29 +03:00
drcrazy
731a5cf56d
Fixed unused import and missing javadoc
2018-04-25 11:06:33 +03:00
drcrazy
05a1f95fa1
Fixed possible issue with sendingFace persistence.
2018-04-25 11:01:55 +03:00
drcrazy
008a1ad11f
Fixed energy ping-pong in cables.
2018-04-24 20:27:42 +03:00
modmuss50
be97fbb415
#releaseBuild
2018-04-22 18:41:26 +01:00
modmuss50
319f74d5cd
Ores that drop the product will now grind to the product. e.g coal ore now grinds to coal, not coal dust
...
This has room for improvement to allow modded ores to work seamlessly with this, but this will do for now.
2018-04-22 18:38:25 +01:00
modmuss50
7f8dff1dd0
Don't clear the button list in random places, also fixes #1494
...
Im not too sure why the button list is added to and cleared every frame, but this is a quick fix to something that should really be changed around at some point. Hopefully this fixes more than it breaks.
2018-04-22 13:40:58 +01:00
modmuss50
d9d4c117d3
#releaseBuild
2018-04-22 13:26:18 +01:00
modmuss50
08a6d309d7
Fix server crash, closes #1495 and closes #1496
2018-04-22 13:22:09 +01:00
modmuss50
5a2bcdd5b2
#releaseBuild
2018-04-21 16:34:32 +01:00
