Commit graph

3023 commits

Author SHA1 Message Date
modmuss50
7ab300a810 Make Craft Tweaker removeInputRecipe less strict, https://github.com/FTBTeam/FTB-Continuum/issues/58
Hopefully this doesnt break scripts, let me know if it does ;)
2018-05-24 11:36:43 +01:00
modmuss50
1c6e26dd99 Fix minor mistake 2018-05-23 15:06:29 +01:00
modmuss50
02c708cd21 Final changes to the item power storage 2018-05-23 14:49:14 +01:00
modmuss50
682670ca51 Item charging + discharging is now done using the caps 2018-05-23 14:07:37 +01:00
drcrazy
250a25d25f Fixed durability bar 2018-05-23 01:33:07 +03:00
drcrazy
ff18e28d1c Remaining changes for powered items. 2018-05-23 00:36:11 +03:00
drcrazy
f203bbbefd Started work on capability for powered item 2018-05-23 00:27:35 +03:00
drcrazy
c4c5f2135c Started work in switching powered items to capability 2018-05-23 00:27:33 +03:00
modmuss50
eb4ba94593
Fix https://github.com/FTBTeam/FTB-Continuum/issues/52 2018-05-20 21:41:58 +01:00
modmuss50
d2f6f89838
Load recipes a bit earlier to fix some issues with crafttweaker, hopefully this doesnt break anything thing else. Fixes #1520 2018-05-20 16:01:58 +01:00
modmuss50
66bb38543e
Fix #1517 2018-05-20 15:43:46 +01:00
modmuss50
8ef39d18e8 Reduce the time on some recipes 2018-05-18 11:27:49 +01:00
drcrazy
85b736065c Fixed charge of TR items. 2018-05-18 12:34:58 +03:00
modmuss50
4c73363206 Fixes #1513 2018-05-17 11:12:21 +01:00
modmuss50
c20e1c72a9 Fixes #1515 2018-05-17 11:00:35 +01:00
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
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
185d84c904 Added JEI support for assembly machine. Closes #1512 2018-05-10 18:32:11 +03: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
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
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
a42e6fea07
Fix #1500 2018-04-28 19:22:43 +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
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
08a6d309d7
Fix server crash, closes #1495 and closes #1496 2018-04-22 13:22:09 +01:00
modmuss50
83e4ad98e1
Add configs to cables, closes #1491 2018-04-21 16:32:04 +01:00
modmuss50
99404f8a46
Remove old code 2018-04-21 16:04:59 +01:00
modmuss50
8c61707317
Fix #1492 2018-04-21 16:02:40 +01:00
modmuss50
21e9a86194
Fix #1489 2018-04-21 15:56:25 +01:00
modmuss50
4734c49a70
Fix #1493 2018-04-21 15:53:54 +01:00
drcrazy
2658401aca Made craft for data storage circuit more balanced. 2018-04-20 15:45:02 +03:00
modmuss50
53ce1828d1 Small tweaks 2018-04-18 17:33:11 +01:00
modmuss50
5c81430c4c Finish off the reactor changes, feel free to suggest some more tweaks to it. 2018-04-18 17:15:33 +01:00
modmuss50
90e0ea23b9 Fixes #1490 2018-04-18 15:59:08 +01:00
modmuss50
09a75893e4 Add larger fusion reactor sizes 2018-04-18 15:46:56 +01:00
modmuss50
10106715d3 Right click the fusion control computer with coils to autoplace them. 2018-04-18 15:07:28 +01:00
modmuss50
d94eb03a06 Update Fusion reactor to use new method for coil location. 2018-04-18 14:48:19 +01:00
modmuss50
f66daa9349
Fix #1488 2018-04-15 13:34:19 +01:00
modmuss50
3805285356
Fix #1484 2018-04-14 00:18:13 +01:00
modmuss50
75b8c4d317
Fix #1485 2018-04-14 00:02:50 +01:00
drcrazy
883638117b Decreased amount of energy required to make UU-matter. 2018-04-13 18:27:46 +03:00
drcrazy
4e8f780406 License ) 2018-04-13 11:45:47 +03:00
冷风
f04c2789a9 Update zh_cn.lang (#1483). Thanks to DYColdWind 2018-04-13 10:30:12 +03:00
modmuss50
65695b86c1
Add copy / pasting of slot configs. 2018-04-12 19:27:11 +01:00
modmuss50
9b23945670
Fix block inventory dropping in some situations 2018-04-12 15:42:09 +01:00
modmuss50
ec30ac8e6c
Fixes https://github.com/TechReborn/TechReborn/issues/1476 2018-04-12 14:23:07 +01:00
modmuss50
8bb7efcc77
Add config for #1478 2018-04-12 14:03:34 +01:00
modmuss50
b8514a998f
Add some missing RebornRegistry annoations 2018-04-12 13:57:29 +01:00
modmuss50
fbd4854f30
Fixes #1480 2018-04-12 13:42:55 +01:00
drcrazy
fef10740ba
Feature/fluidreplicator (#1482)
Added Fluid Replicator multiblock machine.
2018-04-12 15:42:12 +03:00
modmuss50
c12fa28c50
Add ic2 carbon plate recipe to compressor 2018-04-11 18:44:46 +01:00
modmuss50
e171aedd38
Allow upgrades in rollingmachine 2018-04-10 16:04:28 +01:00
modmuss50
1582d419df
Fix Recycler using power when output full, and made it upgradeable 2018-04-10 10:51:10 +01:00
modmuss50
5e18a9ee2d
Fix extractor recipes using ore dict when they aren't supposed to. 2018-04-08 21:01:44 +01:00
modmuss50
7deb407d0a
Fixed electrical furnace not using the correct amount of power when overclocked 2018-04-07 20:31:05 +01:00
modmuss50
d50b3daf6e
Allow charge bench to store more power 2018-04-07 20:26:28 +01:00
modmuss50
0bf602f89e
Change the way the rolling machine balances itemstacks 2018-04-07 20:22:42 +01:00
modmuss50
9a566e0583
Fix fluid generator client/server desync, fixes #1474 2018-04-05 16:09:17 +01:00
modmuss50
f9d99aad1d
Fix power tool tip being behind heat bar 2018-04-05 15:43:19 +01:00
modmuss50
ec56914ea7
Add logic to lock rolling machine, allows it to be automated. Closes #1412 2018-04-05 12:37:31 +01:00
modmuss50
c17f232bf8
Add gui and packets for locking the rolling machine. #1412 2018-04-05 10:31:22 +01:00
modmuss50
f9b864653a
Merge remote-tracking branch 'origin/1.12' into 1.12 2018-04-04 16:17:04 +01:00
drcrazy
7a2c3e30b6 Added plate recipes for obsidian, garnets and refined iron. Closes #1471 2018-04-04 11:21:11 +03:00
modmuss50
29248dcb62
Add RebornCore's AT to make setting a dev env with both in easier 2018-04-03 20:05:18 +01:00
modmuss50
6d8f667cbb
Fix 4 more recipes using too much power 2018-04-03 18:37:09 +01:00
modmuss50
7de2111484
Change recipe to use less power, it was using more than the default input 2018-04-03 18:25:23 +01:00
modmuss50
cf58eb2948
Increase blast furnace energy storage 2018-04-03 18:23:21 +01:00
modmuss50
841cf2fc65
Fixes #1472 2018-04-03 17:03:38 +01:00
modmuss50
a8d180f146
Add energy change per tick 2018-04-03 17:00:04 +01:00
modmuss50
adb12ef43d
Overclocker upgrades give more power input/storage to machine + add some more info to the tool tip in the gui
Also fix for not calling update client side lower down the chain
2018-04-03 16:32:04 +01:00
modmuss50
fc9e7df2f9
Fix machine teirs 2018-04-02 22:31:26 +01:00