Commit graph

4660 commits

Author SHA1 Message Date
modmuss50
44b9c2ef05 Fix #1868 2019-10-28 20:37:53 +00:00
modmuss50
5338898ae3 Fix #1854 2019-10-28 16:04:29 +00:00
modmuss50
39861db8b5 Fix #1874 2019-10-28 15:59:29 +00:00
modmuss50
31962e9bf2 Fix #1872 2019-10-28 15:53:39 +00:00
modmuss50
696fe65edd #releaseBuild 2019-10-26 22:06:50 +01:00
modmuss50
c90e6389a8 Fix #1867 2019-10-26 21:59:55 +01:00
modmuss50
4564be7b49 Fix #1869 2019-10-26 21:56:07 +01:00
modmuss50
b42ecbc070 Tweak cable logic, should fix #1858 2019-10-26 21:54:25 +01:00
modmuss50
14f09886f7 Update libs 2019-10-25 11:58:08 +01:00
modmuss50
ef96e41557 Fix #1844 2019-10-18 20:26:30 +01:00
modmuss50
4bbcf9e282 Fix #1860 2019-10-18 20:02:50 +01:00
modmuss50
371c1fe21b Fix #1859 2019-10-18 19:52:21 +01:00
modmuss50
6151757914 Fix #1857 2019-10-18 19:47:45 +01:00
modmuss50
572ad1ecb4 Merge remote-tracking branch 'origin/1.14' into 1.14.4 2019-10-18 19:42:22 +01:00
modmuss50
79c17600b0 Tweak TR build script, remove some broken things 2019-10-18 19:42:15 +01:00
Meredith Espinosa
3629276e87 Fix tweaker_test.js.mcmeta (#1855) 2019-10-15 22:07:05 +01:00
modmuss50
0cfcfc5f20 #releaseBuild 2019-10-12 19:21:58 +01:00
Meredith Espinosa
57c5ae13f1 Fix a couple typos in the sample script (#1853)
- add semicolons after print lines
- fix item stack creation in wire mill sample
- remove other rolling machine recipe I had for testing
2019-10-11 21:44:26 +01:00
Meredith Espinosa
989e4601af Add LibCD Support (#1851)
* First ugly commit for LibCD support

* fix all the ugly hacks, add rolling machine + fluid gen recipes

* be a bit more lenient with fluid generator names

* add test script, fix a few bugs

* get rid of ShapedRecipeSerializer stuff that's no longer needed

* Add a warning to the sample script
2019-10-11 21:30:26 +01:00
modmuss50
bfce163c99 Fix #1852 2019-10-11 16:26:48 +01:00
modmuss50
643436d129 Cleanup RollingMachineRecipe syncing, should aid with #1851 2019-10-11 16:18:10 +01:00
drcrazy
264224a6f9 Stripped version of Rubber Log. 2019-10-08 13:03:01 +03:00
drcrazy
e72edd5eec New textures for several machines. 2019-10-05 13:20:35 +03:00
drcrazy
ad2d0f6644 UU Matter face lift. Kudos to Spearkiller 2019-10-05 13:13:31 +03:00
drcrazy
106b8e25ba Fix tooltip for cables and typo for solar panels. 2019-09-27 16:42:17 +03:00
drcrazy
f77bc65316 Solar panels got their tooltip back. 2019-09-27 16:29:29 +03:00
modmuss50
5f32f4dfda #releaseBuild 2019-09-26 14:46:54 +01:00
drcrazy
f4e29cf9cb Warnings and Updated textures 2019-09-24 13:35:26 +03:00
modmuss50
b5650bfa2c #betaBuild 2019-09-22 15:27:40 +01:00
modmuss50
b70a938796 Cables can now pull energy out of other mods blocks. 2019-09-22 14:17:46 +01:00
modmuss50
7f4fb6d80b Cleanup 2019-09-22 13:01:34 +01:00
modmuss50
5142f84a3e Fix charging and discharging items in Energy Storage blocks. 2019-09-22 12:27:45 +01:00
modmuss50
3fe62e2c77 19w38b 2019-09-21 13:01:38 +01:00
modmuss50
2d8961589d Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/render/DynamicBucketBakedModel.java
#	src/main/java/techreborn/client/render/DynamicCellBakedModel.java
2019-09-21 12:36:37 +01:00
modmuss50
5001331577 Fix generator's active state being incorrect in some situations 2019-09-21 11:24:40 +01:00
modmuss50
0a7b501511 #betaBuild 2019-09-20 23:12:10 +01:00
modmuss50
d4d55922ca quick fix for translations 2019-09-20 20:53:28 +01:00
modmuss50
c401a336bc Fix #1827 2019-09-20 17:01:37 +01:00
drcrazy
dc1b953a24 Use lithium cell for Li-ion battery. Closes #1840 2019-09-19 11:22:25 +03:00
drcrazy
989acffd4e Bump REI version slightly 2019-09-18 15:45:15 +03:00
modmuss50
c4660308bf Merge branch '1.14' of https://github.com/TechReborn/TechReborn into 1.14.4 2019-09-16 23:12:02 +01:00
modmuss50
a4a578917d Update energy api 2019-09-16 23:11:56 +01:00
drcrazy
666e8f03b2 Fix crash with lamp 2019-09-16 12:53:09 +03:00
modmuss50
7e05b0da12 Merge branch 'power' into 1.14.4 2019-09-15 19:15:39 +01:00
modmuss50
aa6eb60d46 Finish porting to new power api 2019-09-15 19:14:42 +01:00
modmuss50
e39e6e9070 #betaBuild 2019-09-15 15:56:55 +01:00
modmuss50
fb4459c218 More tags fixes #1843 2019-09-15 15:48:35 +01:00
modmuss50
09f7fe2427 Possibly fix build? should be able to undo this after 1 build 2019-09-15 14:27:58 +01:00
modmuss50
7873670a4f Remove some duplicate code 2019-09-15 14:09:20 +01:00
modmuss50
2f9b154e22 Move to RC's fluid instance, closes #1826 2019-09-15 13:59:46 +01:00