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
modmuss50
aaa0121e7c
Merge remote-tracking branch 'origin/1.12' into 1.12
2018-04-02 22:28:39 +01:00
modmuss50
ea6e068682
Protect against tiles that return a null capability
2018-04-02 22:28:14 +01:00
drcrazy
45361a6b46
Last piece of refactoring due to TileGenericMachine intro.
2018-04-02 18:12:58 +03:00
drcrazy
adc4879ec5
Refactoring for multi-block machines.
2018-04-02 17:50:15 +03:00
drcrazy
54ee781bc7
More refactoring for tier1 machines.
2018-04-02 16:58:03 +03:00
drcrazy
80e36f0427
Fixed typos for tier1 tiles folder. New abstract TR machine class
2018-04-02 16:18:48 +03:00
drcrazy
f5b0670d84
Cleanup for energy storage
2018-04-02 14:56:17 +03:00
drcrazy
8038a7cf17
Cleaned up unused ITickable for transformers
2018-04-02 14:44:32 +03:00
modmuss50
20849b4a11
Improve CraftTweaker documentation
2018-04-02 10:42:02 +01:00
modmuss50
980db3cd60
Start of making CraftTweaker documentation a bit clearer.
2018-04-02 00:12:31 +01:00
modmuss50
087a2226d6
Add RecipeSettings to CraftTweaker supports, allows disabling oredict checking.
...
Closes #1455
2018-04-01 23:50:54 +01:00
drcrazy
d563ff748a
Cleanup and configs. Closes #1469
2018-04-01 00:39:58 +03:00
modmuss50
a7d9a1a92d
Reduce time here as well
2018-03-30 16:38:19 +01:00
modmuss50
7c0730ab0f
Reduce tungsten process time from 15 minutes to 90 seconds
2018-03-30 16:36:03 +01:00
drcrazy
799386b872
Added configs. Some work on #1469
2018-03-30 17:34:32 +03:00
drcrazy
694763e6a2
Refactored AOE break checks
2018-03-30 14:56:00 +03:00
modmuss50
b5ad12a4bb
Update rolling machine to use new gui system. Work towards #1412
2018-03-29 11:52:57 +01:00
modmuss50
6e1b608113
Improve power handling with drill and chainsaw
2018-03-29 11:29:01 +01:00
modmuss50
c8886bbd9b
Clean up drill and chainsaw breaking logic, closes #1465
2018-03-29 11:21:20 +01:00
modmuss50
b0e79aa1e6
Fixes chainsaw not working on some wooden blocks, closes #1467
2018-03-29 11:00:17 +01:00
modmuss50
54a7e338c5
Fixes drill breaking liquids, closes #1468
2018-03-29 10:57:25 +01:00
modmuss50
8e983e33ac
Buff speed upgrades again, fixes #1466
2018-03-26 16:05:45 +01:00
modmuss50
8886331f8b
Increase electrolyser energy storage
2018-03-26 15:53:03 +01:00
drcrazy
3e8b63645b
Fixed license header.
2018-03-23 13:21:18 +03:00
drcrazy
67fab7cdf2
Fixed deprecation warning.
2018-03-23 12:05:22 +03:00
drcrazy
a69fa60436
Updated Advanced Drill behaviour. Closes #1463
2018-03-23 02:46:07 +03:00
modmuss50
d272111d16
Merge remote-tracking branch 'origin/1.12' into 1.12
2018-03-22 22:21:14 +00:00
modmuss50
d930d2015d
Changes to the overclocker values, feedback wanted.
2018-03-22 22:20:56 +00:00
drcrazy
f1e659d22d
Updated AOE block break for advanced drill. Some work on #1463
2018-03-22 18:03:51 +03:00
drcrazy
772b0a5d65
Removed unused imports in CT classes.
2018-03-22 18:02:54 +03:00
temp1011
a36c2d4065
Fix Drill break speed in certain conditions ( #1428 )
...
Some work on AdvancedDrill break speed. Thanks to temp1011
2018-03-22 15:39:32 +03:00
modmuss50
23b4ef1038
Merge remote-tracking branch 'origin/1.12' into 1.12
2018-03-20 17:49:29 +00:00
modmuss50
4b1a1b796b
Allow upgrade item to stack to 16 (Still stacks to 1 in machine) + Fix potential loss of items when shift clicking.
2018-03-20 17:49:13 +00:00
drcrazy
2e7dc82b86
Hide scrapboxes output in JEI by default.
2018-03-19 15:20:42 +03:00
modmuss50
da6016b692
Cleanup recipe ore dict setting. #1455
2018-03-19 09:41:20 +00:00
modmuss50
453fd3856a
Fix Quantum Chest holding its items when broken, fixes #1462
2018-03-19 09:26:16 +00:00
modmuss50
369b8a6266
Fixes #1461
2018-03-18 23:43:03 +00:00
modmuss50
9e3e2e204c
Fixes #1457
2018-03-18 23:35:22 +00:00
modmuss50
c0c20d91b9
Fixes #1459
2018-03-18 23:27:41 +00:00
modmuss50
5f162d08b1
Fix compile
2018-03-10 20:20:24 +00:00
modmuss50
06f7f64efb
Add stone variants for the other end ores.
2018-03-10 20:18:53 +00:00
modmuss50
f1a3387fbf
Add extractor support to craft tweaker
2018-03-10 19:50:24 +00:00
modmuss50
d7ce35428c
Add a config option to change the textures of the end ores to use the stone background.
...
I still need to add the other ores, but this is the main one that needs doing.
2018-03-09 19:57:20 +00:00
modmuss50
3b914e658c
Allow using ore dict entries in CraftTweaker Closes #1396
2018-03-06 21:28:05 +00:00
modmuss50
d948db1b7f
Possible fix for #1450
2018-03-06 21:07:49 +00:00
drcrazy
6b68a8aef2
Temporary fix for #1429 .
2018-03-06 02:48:08 +03:00
drcrazy
111ee7630a
Updated API reference for recipes.
2018-03-05 14:45:23 +03:00
drcrazy
4a369d0ee7
Updated buildcraft version. More oredict for centrifuge.
2018-02-22 13:35:18 +03:00
drcrazy
7f4d5ab401
Removed duplicate recipe for dirt in centrifuge.
2018-02-21 10:51:15 +03:00
drcrazy
a80d3eb9ca
Removed duplicate recipe for Distillation tower
2018-02-19 18:21:10 +03:00
modmuss50
ec6fee9230
Fix crash with OC compat
2018-02-16 20:14:36 +00:00
drcrazy
0ecdce2717
Made solar panels configurable.
2018-02-16 12:17:05 +03:00
modmuss50
a54de62a6a
Some more basic methods for open computers
2018-02-14 14:12:31 +00:00
modmuss50
2180fe4ef2
Initial work on open computers support, more to come in the future.
...
When things are a bit more final with it, I will add some docs onto the wiki pages.
2018-02-13 23:56:38 +00:00
modmuss50
f7008d9c87
Fix Issues with fake players breaking wood logs, fixes #1436
2018-02-13 17:44:46 +00:00
drcrazy
c5d162c527
Fixed GUI progress for fluid generators. Some work on #1430
2018-02-13 14:27:31 +03:00
冷风
ce9066e546
Update zh_cn.lang ( #1440 )
2018-02-13 08:32:03 +00:00
drcrazy
2f7ce0f563
Limited Centrifuge bottom slot to cells only.
2018-02-13 01:56:18 +03:00
Dimmerworld
217d7e1a44
Display(in hand) adjustments for Alarm, Led, and led2 ( #1439 )
2018-02-12 17:18:33 +03:00
modmuss50
9c7f1995a8
Update year in license
2018-02-11 14:08:13 +00:00
modmuss50
9c3d9d8e27
Merge remote-tracking branch 'origin/1.12' into 1.12
2018-02-11 14:01:45 +00:00
modmuss50
3fe260b739
Revert "Add a config to lock the rolling machine recipe + some optimisations #1412 "
...
This reverts commit 0b8f139
2018-02-11 14:01:24 +00:00
Dimmerworld
27dacb327a
Alarm cleanup + tooltip and techreborn manual UI ( #1437 )
...
* Alarm cleanup and tooltip, Tech manual UI
* add peskty comma
* Compress png
* Rename to wiki and asked user before opening browser
2018-02-11 13:59:52 +00:00
Dimmerworld
9349ffe264
Update forge and Sound options for Alarm ( #1435 )
...
* Update forge and Sound options for Alarm
* Revert changes to gradle wrapper properties
* Cleanup imports
* Removed sneaky debugging stuff
2018-02-10 11:53:11 +00:00
drcrazy
38933ca8a8
Made centrifuge to use oreDict for some inputs
2018-02-07 15:36:56 +03:00
drcrazy
543a2a7271
Added removeAll for reactor and rolling machine. Closes #1427
2018-02-02 18:33:45 +03:00
modmuss50
0b8f139e6d
Add a config to lock the rolling machine recipe + some optimisations #1412
2018-01-31 13:47:48 +00:00
modmuss50
a3d2aa9907
Merge remote-tracking branch 'origin/1.12' into 1.12
2018-01-31 13:08:35 +00:00
modmuss50
e9039e6693
Fixes AutoCrafting table crash closes #1423
2018-01-31 13:08:21 +00:00
drcrazy
73aa9f1d5e
Nerfed oil cell energy output. Closes #1424
2018-01-31 15:39:00 +03:00
modmuss50
34816e5ee7
Fixes #1425
2018-01-31 10:09:39 +00:00
modmuss50
af57ef708d
Fixes #1426
2018-01-31 09:46:26 +00:00
modmuss50
6c9712956c
Add back config options for copact modules
2018-01-30 23:46:34 +00:00
modmuss50
8a4aafb042
Add some missing configs + small cleanup
2018-01-30 23:32:45 +00:00
modmuss50
7f26541237
Add config gui
...
Remove unused config
2018-01-30 23:20:21 +00:00
modmuss50
9cd916f9ce
Fix duplicate config key name
2018-01-30 22:10:35 +00:00
drcrazy
a6df9441ec
Updated reactor GUI. Closes #1422
2018-01-29 18:17:32 +03:00
modmuss50
2e115242a2
Might fix #1421
2018-01-29 13:14:46 +00:00
drcrazy
73b2f36b24
Fixes for wrenching blocks. Closes #1417 and #1418
2018-01-26 12:27:58 +03:00
drcrazy
79582cd94b
Fill\drain fluidgen tank only on server
2018-01-21 02:16:51 +03:00
modmuss50
2cb5645806
Fixes #1399
2018-01-20 16:27:50 +00:00
modmuss50
677fa7765c
Update old tank syncing code, fixes TechReborn/TechReborn/issues/1377
2018-01-20 16:16:56 +00:00
drcrazy
e4736447bd
RecipeCrafter for scrapboxinator
2018-01-19 18:08:27 +03:00
drcrazy
44b6f20357
Updated scrapboxinator to crafter and new GUI.
2018-01-19 18:07:52 +03:00
modmuss50
e0eb725878
Fix crash when codechicken lib isn't installed. #releaseBuild
2018-01-19 11:19:53 +00:00
drcrazy
c69b9f46b6
Added ability to remove fluidgenerator recipe via CT. Closes #1404
2018-01-19 11:17:36 +03:00
temp1011
91a56077d8
Work on Advanced Drill ( #1411 )
...
* Raytracing for drill
* Stop crashes if raytrace is somehow null
* getCount() already checks for emptiness I think
2018-01-19 10:07:40 +03:00
drcrazy
8e12543902
Fixed RemoveAll in CraftTweaker. Closes #1410
2018-01-17 15:39:41 +03:00
drcrazy
ca9508c381
Deprecated ScrapboxList.
2018-01-17 13:57:40 +03:00
drcrazy
4fc45221a2
Removed scrapboxlist usage. Closes #1407
2018-01-17 13:53:25 +03:00
modmuss50
1bfb5d5604
Fix crash with Fusion Control computer, fixes part of #1395
2018-01-12 19:51:06 +00:00
modmuss50
819e3a5ee1
Add a null check for RayTraceResult may fix #1393
2018-01-12 19:48:41 +00:00
drcrazy
52e1fb2dc9
Fixed compressor recipe for lapis. Second point from #1396
2018-01-12 18:48:09 +03:00
drcrazy
af755a9f6e
Changed carbon fiver recipe to shaped. Closes #1394
2018-01-12 01:13:44 +03:00
drcrazy
27b1535242
Added oreDict for blockBronze. Closes #1401
2018-01-11 14:53:40 +03:00
drcrazy
9fafbf1ed4
Changed TR solar panel to use paneGlass. Closes #1400
2018-01-11 13:55:54 +03:00
drcrazy
161553503b
Fix oredict for smallDusts. Closes #1392
2018-01-11 13:31:15 +03:00
InterPlay
9de4eb947b
Updated to the newer version coming soon (pt-BR) ( #1408 )
...
* Updated pt-BR translation. Kudos to InterPlay02
2018-01-11 13:13:22 +03:00
drcrazy
4332e8852f
TR part for #1402 done. RC to go.
2018-01-10 15:57:58 +03:00
drcrazy
85cd77e5c1
Some work on #1402 . Teh moar to come.
2018-01-09 17:48:14 +03:00
modmuss50
268a16958b
Format + license headers.
2018-01-08 18:29:12 +00:00
modmuss50
2a0a9e5636
Merge remote-tracking branch 'remotes/origin/1.12' into feature-alarm
2018-01-08 17:45:29 +00:00
Dimmerworld
86d37514a7
Recipe for alarm and misc fixes
2018-01-03 15:17:20 +11:00
Dimmerworld
2177b72e41
Animation
2018-01-03 14:26:23 +11:00
Modmuss50
8d6c595215
Merge pull request #1391 from DYColdWind/patch-1
...
Update zh_cn.lang
2017-12-30 01:58:05 +00:00
冷风
78bc17a721
Update zh_cn.lang
2017-12-30 07:29:27 +08:00
modmuss50
5c16978e4d
Improve it a bit more
2017-12-29 18:15:27 +00:00
modmuss50
1d6c6139ec
Move JEI item pane out of the way if the slot config goes of the side of the screen.
2017-12-29 18:12:04 +00:00
modmuss50
ff2ed99d14
Reimplement JEI show recipes button, so it can be disabled when the slot config is shown.
...
I didnt see a better way to do this, please let me know if you know better.
2017-12-29 17:24:01 +00:00
modmuss50
3e8cf290bf
Fixes crash with auto crafting table.
2017-12-29 17:09:19 +00:00
modmuss50
0b6808013d
Fixes crash with recipe book.
2017-12-29 12:50:10 +00:00
modmuss50
57f3e43ec5
Add removeAll() to all machines in crafttweaker, closes #1389
2017-12-29 12:33:05 +00:00
Dimmerworld
bdc34d673c
Proper faces
2017-12-29 16:50:35 +11:00
冷风
5f4a1be06b
Update zh_cn.lang
2017-12-29 13:26:01 +08:00
modmuss50
602cfebc38
#betaBuild
2017-12-28 15:02:59 +00:00
modmuss50
5b26f36082
Small tweak to config gui
2017-12-28 14:57:52 +00:00
modmuss50
9ff30a4344
Add support for charging FE based items
2017-12-28 14:53:56 +00:00
modmuss50
af54caf4bf
Merge remote-tracking branch 'origin/1.12' into 1.12
2017-12-28 14:40:44 +00:00
modmuss50
3b69a1a143
Added the ability to filter inputs on a slot so it only accepts valid items
2017-12-28 14:40:19 +00:00
Modmuss50
ff1dc294df
Merge pull request #1388 from InterPlay02/1.12
...
(pt-BR) Updated to match the new en_us.lang file
2017-12-28 14:31:45 +00:00
InterPlay
75f01ee507
Updated to match the new en_us.lang file (pt-BR)
2017-12-28 12:29:32 -02:00
modmuss50
751746df6f
Allow lang files to specify the location of the fluid name, closes #1386
2017-12-28 14:19:26 +00:00
modmuss50
fbd31e1177
More gui fixes for slots
2017-12-28 14:01:33 +00:00
modmuss50
04b4fa2b88
Fix tank rendering over slot config popup
2017-12-28 13:46:33 +00:00
drcrazy
7dfc8e41c3
Very-very light change in cross colors.
2017-12-28 14:43:50 +03:00
drcrazy
f18adc9c0a
Fixed texture issue in JEI.
2017-12-28 02:05:13 +03:00
InterPlay
61429dc15e
Fixed a wrong placement of signals ( #1385 )
2017-12-27 22:30:43 +00:00
InterPlay
77b8b75302
Fixed a wrong placement of signals
2017-12-27 20:11:59 -02:00
Dimmerworld
e93451b595
Woop woop - Alarm work ( #1380 )
...
* Alarm makeover
Model,
boundrybox,
textures,
name localization for the alarm
* Actual translations for Alarm
* Texture resize
As requested
(Didn't notice dimensions when I was grabbing off Prospector)
2017-12-26 01:30:36 +00:00
modmuss50
510697c021
Fix #1378
2017-12-25 00:25:11 +00:00
Modmuss50
cbcb465c97
Added support for individual slot configuration
...
* start work on slot config
* More slot work
* More gui work for slot config
* Remove old sided code
* More slot work
* More slot memes
* Stuff seems to be working :)
* Start work on auto input / output
* Slot IO check boxes now work
* Fix buttons at different screen resolutions
* Improve close button
* Gui polish
* Fix multiblock hologram rendering
* More fixes + changes
* Cleanup + output fix
2017-12-25 00:18:43 +00:00
Modmuss50
a59647a0b7
Merge pull request #1379 from InterPlay02/1.12
...
Fixed one single word
2017-12-23 22:13:45 +00:00
drcrazy
05884b2fda
Fix issue with chainsaw cutting speed. Closes #1376
2017-12-23 00:28:53 +03:00
InterPlay
91ee4e722d
Fixed one single word
2017-12-22 12:32:24 -02:00
modmuss50
5a40749bcd
Fixed #1364
2017-12-22 12:51:16 +00:00
modmuss50
623983f20a
Merge remote-tracking branch 'origin/1.12' into 1.12
2017-12-19 23:50:52 +00:00
modmuss50
7ab59db7c0
Improve idle auto crafting table tick time, more work still needs to be done. Closes #1374
2017-12-19 23:50:38 +00:00
drcrazy
1b9844a6cd
Made obsidian grindable.
2017-12-19 13:05:57 +03:00
冷风
ec1be6b639
Update zh_cn.lang
2017-12-19 13:48:50 +08:00
modmuss50
7594b55fb5
Start work on the alarm
2017-12-18 19:58:52 +00:00
InterPlay
2815bc84d4
Just fixed a single word
2017-12-18 16:09:39 -02:00
InterPlay
1909d426e3
Uploaded pt-BR.lang File
2017-12-18 16:08:00 -02:00
drcrazy
328aac0ed2
Make lapis ore grindable to vanilla lapis.
2017-12-18 18:29:00 +03:00
modmuss50
677bb59ceb
Should hopefully fix server crash #releaseBuild Fixes #1371
2017-12-18 01:48:25 +00:00
modmuss50
55c5f58c7e
Clocking device now makes the player fully invisible
2017-12-17 22:13:29 +00:00
modmuss50
3c7cd638c1
Make smaller cables have a smaller bounding box
2017-12-17 22:05:14 +00:00
modmuss50
dc4cdbb9cc
Fixes #1368
2017-12-17 21:53:14 +00:00
modmuss50
ee075feea9
Fixes #1359
2017-12-17 21:43:12 +00:00
modmuss50
7f289e2356
Add ic2 item discharge support, closes #1357
2017-12-17 21:36:48 +00:00
modmuss50
82eb0f62d6
Fixes #1354
2017-12-17 21:24:25 +00:00
drcrazy
dce7e43c4f
Fixed amount for empty cells. Closes #1366
2017-12-16 01:46:34 +03:00
drcrazy
6c7f9078ec
Secondary gem moved to eventHandler. Closes #1365
2017-12-15 16:43:48 +03:00
drcrazy
376f02df26
Updated Sawmill GUI and TileEntity.
2017-12-13 12:29:39 +03:00
drcrazy
1d18740215
Fixed rotation for solar panels. Closes #1358
2017-12-11 12:03:20 +03:00
drcrazy
17f819e9c6
Added charcoal dust grinder recipe.
2017-12-08 20:25:25 +03:00
drcrazy
a419189926
Added dust->ingot<->block recipes for several materials. Closes #1356
2017-12-08 16:43:04 +03:00
modmuss50
53c731d678
Handful of improvements to the electrical furnace, closes #1349
2017-12-04 20:55:57 +00:00
drcrazy
777707373a
Fixed cells piping into Industrial Grinder.
2017-12-04 23:10:33 +03:00
drcrazy
2f54305f6d
Added filter for fluidSlot. Closes #1352
2017-12-04 22:34:34 +03:00
冷风
e8d6009e83
Update zh_cn.lang
2017-12-02 08:26:48 +08:00
drcrazy
df24adb936
Made solar panel wrenchable
2017-12-01 19:24:02 +03:00
drcrazy
6202b46cf7
Fixed unused imports
2017-12-01 19:04:30 +03:00
Dimmerworld
3c68417fd9
Item liquidation ( #1347 )
...
We salute our brace comrades:
Solar panel
Compact solar panel
and Quantum singularity
Whom wern't quite ready to be implemented.
2017-12-01 17:16:39 +03:00
drcrazy
b2d2be24c6
Updated recipies and fixed build
2017-11-30 16:46:11 +03:00
drcrazy
f6fca1c623
Merge branch '1.12' of https://github.com/TechReborn/TechReborn.git into feature/solar-panles
2017-11-29 17:13:36 +03:00
drcrazy
9ac8b31599
Fixed TOP\Waila icon for active machine
2017-11-29 15:23:40 +03:00
modmuss50
4d043faa27
Fixes #1344
2017-11-29 09:35:00 +00:00
modmuss50
2603fa5df7
Merge remote-tracking branch 'origin/1.12' into 1.12
2017-11-28 17:44:18 +00:00
modmuss50
b8964b6eca
Update mappings
2017-11-28 17:25:36 +00:00
drcrazy
eab088c094
Merge branch '1.12' into feature/solar-panles
...
Conflicts:
build.gradle
src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
src/main/java/techreborn/blocks/lighting/BlockLamp.java
2017-11-28 17:28:47 +03:00
drcrazy
703f49752e
Updated top texture for solar panels
2017-11-28 16:52:14 +03:00
drcrazy
be227b4edb
Fixed type in zenclass name. Closes #1332
2017-11-28 15:37:38 +03:00
modmuss50
3afe2c8910
Add lang names for new lights
2017-11-28 15:37:34 +03:00
Alistair Buxton
642e6b0f2b
Implement powered lighting.
2017-11-28 15:37:32 +03:00
drcrazy
34913c4817
Added config for several multiblock machines.
2017-11-28 15:23:32 +03:00
drcrazy
9a8a7455ff
Fixed warning for FusionReactorRecipeWrapper
2017-11-27 17:58:37 +03:00
drcrazy
779551cf70
Fixed JavaDoc and CTScrapbox warnings
2017-11-27 17:55:29 +03:00
modmuss50
e2f177b757
Can now charge ic2 items, closes #1202
2017-11-27 13:34:45 +00:00
drcrazy
bff9179734
Updated multiblock to use BlockPos rather than CoordTriplet
2017-11-25 03:30:58 +03:00
modmuss50
9aa3d3e59d
Added back buildcraft support
2017-11-24 14:59:49 +00:00
modmuss50
def8cb5355
Fix dupe bug, Fixes https://github.com/TechReborn/TechReborn/issues/1342
2017-11-18 20:37:14 +00:00
冷风
1f224277e5
zh_cn.lang ( #1341 )
...
* Update zh_cn.lang
* Update zh_cn.lang
* Update zh_cn.lang
2017-11-18 12:02:46 +03:00
drcrazy
64495919c0
Added config for transformers to follow IC2 style. Closes #1326
2017-11-14 14:34:14 +03:00
drcrazy
ffe115bee1
Fixed iridium oregen. Closes #1330
2017-11-13 18:29:16 +03:00
drcrazy
150fb2a2c4
Fixed iron furnace fuel slot shift-click in ugly way. Closes #968
2017-11-13 13:46:20 +03:00
drcrazy
53c8033a99
Fixed duplicate registration for basic machine frame. Closes #1340
2017-11-13 11:47:15 +03:00
drcrazy
9d1e64b1b2
Fixed texture error for fluid itemblocks.
2017-11-13 02:14:44 +03:00
drcrazy
bf5b649fc4
Removed unused code, added Override annotation
2017-11-12 12:15:32 +03:00
drcrazy
3d623292f8
Fixed more warnings
2017-11-10 12:48:01 +03:00
drcrazy
25d561c81c
Fixed imports and suppressed recipe warnings.
2017-11-10 12:27:31 +03:00
drcrazy
29d1176861
Fixed casing model with CTM enabled
2017-11-10 01:29:08 +03:00
drcrazy
41dd0468e6
Fixed CTM version of LESU Storage.
2017-11-10 01:21:59 +03:00
drcrazy
5bfe649360
Added coils check in onLoad. Closes #1337
2017-11-08 03:16:51 +03:00
drcrazy
5f2ddec821
Un-oredicted frame for grinder recipe. Closes #1331
2017-11-08 02:05:07 +03:00
drcrazy
8cacd3d8d1
Limited LESU max storage to MAX_INT FE or MAX_INT/4 EU. Closes #1328
2017-11-08 01:48:11 +03:00
drcrazy
2ff9b6950d
Fixed type in zenclass name. Closes #1332
2017-11-05 23:49:11 +03:00
modmuss50
d004ceef0e
Add lang names for new lights
2017-11-05 12:04:22 +00:00
drcrazy
19ccbd681d
Fixed itemBlock rendering. TOP\Waila are still an issue
2017-11-05 02:32:06 +03:00
Alistair Buxton
c6ac9110fe
Implement powered lighting.
2017-11-04 07:31:07 +00:00
drcrazy
18fed6b237
Fixed #texture start up error
2017-10-30 23:18:03 +03:00
drcrazy
047507f4fc
Fixed error message about #texture
2017-10-29 02:44:04 +03:00
modmuss50
2f52171a04
Still didnt fix it ;(
2017-10-27 09:40:12 +03:00
modmuss50
c0fc388a01
I tried to fix item rendering issues, but failed.
2017-10-27 09:40:11 +03:00
modmuss50
e0edff6891
Some more work on solar panels.
2017-10-27 09:40:10 +03:00
modmuss50
0aa8974035
Fix some issues with the solar panels
2017-10-27 09:40:09 +03:00
Dimmerworld
3fe609e207
Fix poweroutput
2017-10-27 09:40:08 +03:00
Dimmerworld
9972822acd
Drcrazy fixes
2017-10-27 09:40:07 +03:00
drcrazy
c7f599ead1
Merge with upstream
2017-10-27 09:39:31 +03:00
Dimmerworld
60426c4cc1
canSeeSky reduced to every 20 ticks @Modmuss request
2017-10-27 09:35:02 +03:00
Dimmerworld
37de6f6a6d
Justifications
2017-10-27 09:35:01 +03:00
Dimmerworld
d4c941cb5a
Modmuss50 changes
...
ID removed
Configs removed
Private Enum buffer removed
2017-10-27 09:35:00 +03:00
Dimmerworld
63def52526
Hybrid texture top fix
2017-10-27 09:34:59 +03:00
Dimmerworld
5396551891
Revert "Update to latest commit(Master)"
2017-10-27 09:34:58 +03:00
Dimmerworld
8a5df0fc4b
Texture readd, classes unaltered and debug message removed
2017-10-27 09:34:57 +03:00
Dimmerworld
4307cb8258
misc fixes
2017-10-27 09:34:56 +03:00
Dimmerworld
5d0b5c3ea3
Balance, textures and items
2017-10-27 09:34:55 +03:00
Dimmerworld
4205beaead
Balance and null fix
2017-10-27 09:34:54 +03:00
Dimmerworld
9855cce93d
Upgrade merge
2017-10-27 09:34:53 +03:00
Dimmerworld
74b8246b39
More work on tile entity
2017-10-27 09:34:51 +03:00
Dimmerworld
fed439307e
Tile entity work
2017-10-27 09:34:50 +03:00
Dimmerworld
c4711848ae
Textures and block work.
2017-10-27 09:34:49 +03:00
Dimmerworld
d3ede81de4
alter
2017-10-27 09:34:48 +03:00
Dimmerworld
c651363b73
Update to latest commit(Master)
2017-10-27 09:34:47 +03:00
drcrazy
c8b6edd390
Updated LESU. Closes #1322
2017-10-26 02:26:07 +03:00
drcrazy
bae5f73d85
Refactored smelting recipes init.
2017-10-24 18:14:01 +03:00
drcrazy
440c089b5f
Fixed scrapbox list of outputs. Closes #1317 . I hope )
2017-10-24 15:09:53 +03:00
drcrazy
57151a6f67
Brought back upgrades recipes in IC2 dedup mode. Closes #1302
2017-10-24 12:21:10 +03:00
drcrazy
5974ae094d
Added icons for armor slots in MFE\MFSU\etc.
2017-10-23 18:18:25 +03:00
drcrazy
c0a43c0947
Icons for armor slots
2017-10-23 16:02:58 +03:00
modmuss50
3901d60545
Some work on charging ic2 items, moving back to a proper pc.
2017-10-22 18:23:58 +01:00
modmuss50
1c6336eb68
Add grinder support to CT, closes https://github.com/TechReborn/TechReborn/issues/1318
2017-10-22 18:12:31 +01:00
drcrazy
26ddc03a65
Added background icon for upgrade slots
2017-10-21 02:07:06 +03:00
drcrazy
a57c09f633
Added ability to remove single\all scrapbox outputs. Closes #1305
2017-10-20 23:09:05 +03:00
drcrazy
30090b53dc
Small fixes to ru_ru translation
2017-10-20 12:16:58 +03:00
SkyFire55
7e4f2ebc6c
Russian language support update ( #1315 )
...
* Russian language support update
* Different translation fixes
2017-10-20 12:09:45 +03:00
drcrazy
5702e79e7a
Do net reset block break progress upon item charge. Closes #1312
2017-10-20 03:00:28 +03:00
drcrazy
441ac4887a
Made Cloaking device wearable in 1.12. Closes #1314
2017-10-20 01:58:35 +03:00
drcrazy
3f1e7b9111
Fixed transformer upgrade name. Closes #1313
2017-10-19 12:20:56 +03:00
Alistair Buxton
e43a4dbf3c
Don't place a block when opening energy store GUI.
2017-10-17 07:25:20 +01:00
drcrazy
7d7340111d
Added Distillation tower. Closes #884
2017-10-16 15:52:10 +03:00
drcrazy
4c8a9fb7e8
Textures for solar panels
2017-10-16 01:49:05 +03:00
drcrazy
c4916f5c7e
Fixed model loading errors for sapling and plates
2017-10-15 02:00:13 +03:00
drcrazy
7b4178eba8
Fixed sapling startup error message
2017-10-13 18:20:04 +03:00
drcrazy
2fd8df2118
Added CT support for plasma generator
2017-10-13 17:41:29 +03:00
drcrazy
ae1dfe4e45
Fixed warning related to deprecated JEI compat.
2017-10-13 13:31:11 +03:00
modmuss50
62251e7842
Merge remote-tracking branch 'origin/1.12' into 1.12
2017-10-13 11:07:26 +01:00
modmuss50
a26d11ee51
Fix small issue with TOP support.
2017-10-13 11:07:18 +01:00
drcrazy
47134cf2ab
Added plasma generator. Some work on #884
2017-10-13 03:20:34 +03:00
modmuss50
eb6098de5d
Re-enable retro gen support (beta), let me know of any issues. Closes #1162
2017-10-12 22:12:09 +01:00
modmuss50
09969559e8
Add fluid gen support to CT, closes #1153
2017-10-12 22:10:41 +01:00
modmuss50
46f011ef69
Remove upgrades from the dedupe list, fixes #1302
2017-10-12 21:55:41 +01:00
modmuss50
31f3aff11f
Remove ghost upgrade slots on some machines.
2017-10-12 21:51:07 +01:00
modmuss50
79984ab107
Fixes #1295
2017-10-12 21:32:53 +01:00
modmuss50
e490669405
Fixes CraftTweaker support, closes #1303
2017-10-12 21:19:51 +01:00
modmuss50
b7b9cb9963
Merge remote-tracking branch 'origin/1.12' into 1.12
2017-10-12 17:50:13 +01:00
modmuss50
984e9eb2f2
Improve TOP support
2017-10-12 17:50:03 +01:00
drcrazy
416361ff3b
Increased internal buffer for cable to x6 of transfer rate. Closes #1296
2017-10-12 18:23:50 +03:00
drcrazy
b80bf1240d
Updated cable to push energy to other cables. Closes #1296
2017-10-12 02:05:20 +03:00
modmuss50
fd5af79496
Merge remote-tracking branch 'origin/1.12' into 1.12
2017-10-11 17:42:36 +01:00
modmuss50
23ccd878bd
Fix rolling machine CT
2017-10-11 17:42:27 +01:00
drcrazy
ae27bf7b9f
Added multiblock hologram to Vacuum Freezer. Closes #1297
2017-10-11 17:24:36 +03:00
modmuss50
610c2e479e
Small tile cleanup + small fixes for potential issues.
2017-10-11 13:04:09 +01:00
