Commit graph

4531 commits

Author SHA1 Message Date
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
modmuss50
fcfd387bc0 Semver + include RC Closes #1831 2019-09-15 13:43:04 +01:00
modmuss50
ab15533351 Fix #1833 2019-09-15 13:30:05 +01:00
modmuss50
168dc30314 #alphaBuild 2019-09-12 17:00:21 +01:00
modmuss50
6e53132c59 Merge remote-tracking branch 'remotes/origin/1.14' into 1.15 2019-09-12 16:55:52 +01:00
modmuss50
8c9c736da9 19w37a 2019-09-12 16:55:41 +01:00
modmuss50
cc51e9b016 #betaBuild 2019-09-10 14:24:26 +01:00
modmuss50
0b39eb9863 Fixes #1836 2019-09-10 14:21:23 +01:00
modmuss50
4f80a8c651 start on new power api 2019-09-10 14:09:15 +01:00
drcrazy
9075f320d4 Refactoring for rubber blocks 2019-09-09 14:49:47 +03:00
drcrazy
e4cb66768e Helper for rubber stuff 2019-09-09 14:46:53 +03:00
drcrazy
de917a64bc New textures for nuggets, plates and small dusts. 2019-09-04 11:32:15 +03:00
drcrazy
b22cc3a827 New textures for dusts, ingots and gems 2019-09-03 20:28:13 +03:00
drcrazy
8cff7c1644 New textures for storage blocks 2019-09-03 20:09:34 +03:00
drcrazy
aab010af3c Updated textures for rubber planks, door, trapdoor 2019-09-02 16:23:03 +03:00
modmuss50
ea23ef7038 cleaup method name 2019-08-30 19:26:37 +01:00
modmuss50
0724c2017a Cleanup / minor improvements to the chunk loader. 2019-08-30 18:12:17 +01:00
modmuss50
3f4e53e259 Made the chunkloader work 2019-08-30 17:53:46 +01:00
drcrazy
adebb34a03 Charge\discharge items on server side only. Should fix #1822 2019-08-30 15:15:47 +03:00
drcrazy
7c4564b5ab Move common code for iron machines into abstract class 2019-08-30 14:26:23 +03:00
drcrazy
fbfa24b6ff Iron furnace accumulates and drops experience. Closes #1817 2019-08-29 02:43:39 +03:00
drcrazy
528b868abe Do not forget to call super in GUI init 2019-08-28 17:56:59 +03:00
drcrazy
2518c32c54 UpDown button refactoring 2019-08-28 15:40:42 +03:00
drcrazy
0d68f794ae Iron furnace drops experience. Still need to save fuel time to tag 2019-08-28 02:46:56 +03:00
modmuss50
1cc56ed2e3 #alphaBuild 2019-08-28 00:20:08 +01:00
modmuss50
4a5fe76323 19w34a 2019-08-27 23:58:42 +01:00
drcrazy
09b59d6c87 Initial work on experience from smelting for #1817 2019-08-27 01:52:52 +03:00
drcrazy
6ceb6e69cf Further refactoring of Iron machines 2019-08-26 23:31:56 +03:00
modmuss50
2b28281d90 #betaBuild 2019-08-26 20:25:41 +01:00
modmuss50
a19c25a504 Fixes #1812 2019-08-26 20:11:55 +01:00