Commit graph

4451 commits

Author SHA1 Message Date
modmuss50
baa96d8877 Updates 2019-12-11 14:28:39 +00:00
modmuss50
b1f3cbf1c6
#betaBuild 2019-12-10 07:34:39 +00:00
Meredith Espinosa
649d28d63c update to new libcd! (#1902) 2019-12-10 07:31:32 +00:00
modmuss50
b74d46101b Fix #1875 2019-12-08 22:40:29 +00:00
modmuss50
d04e1d7dec Performance improvements 2019-12-08 22:13:36 +00:00
Juuxel
87a36d1c23 Add comparator support for energy storage and generator blocks (#1901)
* Add comparator support for energy storage blocks

Does not update automatically yet, so there needs to be a call to
World.updateHorizontalAdjacent.

* Switch to ceil() in energy storage comparator calculation

Should prevent low amounts of energy of rounding to 0.

* Add comparator support to generators

Requires TechReborn/RebornCore#132.
2019-12-07 18:36:41 +00:00
modmuss50
4764271967 Fix #1900 2019-12-05 19:01:56 +00:00
modmuss50
84e6246890 #betaBuild 2019-12-04 17:58:26 +00:00
modmuss50
7306638593 Fix #1898 2019-12-04 17:21:09 +00:00
modmuss50
375fb83e70 Fixed #1899 2019-12-04 17:08:20 +00:00
modmuss50
e48d1f1184 Pre 4 mappings 2019-12-04 16:49:53 +00:00
modmuss50
a0fbc1ccb3 More fixes 2019-11-28 21:12:36 +00:00
modmuss50
b01eb38863 Fix a few more issues with the fusion reactor 2019-11-28 21:10:08 +00:00
modmuss50
d7cfbcd443 Cleanup 2019-11-28 17:15:46 +00:00
Yoghurt4C
b0d548cdf6 advanced fabric-mining-levels.jar integration (#1895)
* advanced fabric-mining-levels.jar integration

* ace of spades
2019-11-28 17:00:07 +00:00
modmuss50
797e66f8ca Fix fusion reactor closes #1894 2019-11-28 16:59:27 +00:00
modmuss50
eebdf9a4b5 #betaBuild 2019-11-26 20:49:05 +00:00
modmuss50
46e2c143bc Fix fusion reactor not always working. 2019-11-26 20:42:34 +00:00
modmuss50
0cf6d7e888 Fix auto coil placement in some cases 2019-11-26 20:36:25 +00:00
modmuss50
57c8ebdb3d multiblock render changes 2019-11-26 20:19:57 +00:00
modmuss50
bfdde04892 1.15-pre2 loads of new mappings 2019-11-26 19:03:36 +00:00
modmuss50
937b184ace Update fabric 2019-11-22 21:41:13 +00:00
modmuss50
6cb919b9a2 Fix rubber trees #betaBuild 2019-11-22 21:05:40 +00:00
modmuss50
8d1c723f4e Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
# Conflicts:
#	build.gradle
2019-11-22 15:54:42 +00:00
modmuss50
3e7709b1b4
#releaseBuild 2019-11-22 15:53:09 +00:00
modmuss50
d6935ff09d #betaBuild 2019-11-21 22:16:15 +00:00
modmuss50
6504c24706 Fix server crash 2019-11-21 22:03:44 +00:00
modmuss50
bc57e38828 Merge remote-tracking branch 'origin/1.15' into 1.15 2019-11-21 21:51:38 +00:00
modmuss50
c8ce611841 1.15-pre1 2019-11-21 21:51:30 +00:00
shedaniel
16fe02f359 FIx REI Compat for 1.15 snapshots (#1888) 2019-11-15 17:17:06 +00:00
modmuss50
f9b9279500 Fix some block render layers 2019-11-14 20:06:45 +00:00
modmuss50
977ac8f8a8 merge fixes 2019-11-14 19:09:32 +00:00
modmuss50
d5e89c5e20 Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/blocks/misc/BlockRubberLog.java
2019-11-14 19:03:36 +00:00
modmuss50
a984263b04 inital 19w46a port 2019-11-14 18:37:42 +00:00
shedaniel
8ecfa4207a Some REI Compat Changes (#1882)
* Update REi

* Update to 3.2.6
2019-11-07 14:46:19 +00:00
drcrazy
201785b674 Fix cell count in centrifuge. Closes #1856 2019-11-04 17:54:31 +03:00
drcrazy
7d17823b55 Bump dependencies 2019-11-01 16:47:23 +03:00
modmuss50
1b35ef88ee #releaseBuild 2019-10-30 15:36:13 +00:00
modmuss50
68c5e1637d Revert "Fix #1854"
This reverts commit 5338898a
2019-10-30 15:35:09 +00:00
modmuss50
99ad05f772 #releaseBuild 2019-10-28 21:13:25 +00:00
modmuss50
9314899b08 Fix #1873 2019-10-28 21:10:12 +00:00
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