Commit graph

26 commits

Author SHA1 Message Date
modmuss50
c2e74f070d Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts:
#	build.gradle
2020-04-11 15:40:23 +01:00
modmuss50
8b16fe191b Fix #2070 2020-04-11 14:51:02 +01:00
modmuss50
55f9a5df52 20w15a 2020-04-09 01:47:11 +01:00
modmuss50
7b99e2e9b7 License updates + fixes 2020-01-03 22:46:07 +00:00
Justin Vitale
9328c47bed Tiered tank and storage blocks, GUI improvements, refactoring, cell nerf and misc organisation (#1932)
Tanks, storage blocks and variouse stuff. Thanks to Dimmerworld!!
2020-01-03 00:24:46 +03:00
modmuss50
de4c14542b Update to new reborn core 2020-01-01 15:58:16 +00:00
modmuss50
e171d0eabc Remove duplicate annotations. 2019-12-13 10:00:59 +00:00
modmuss50
5e5e997b93 Move most int fluid values to FluidValue.
This has been done to make it easier in the future to move to a new fluid system.
Some work is still needed (in recipes mainly) to move away fully away from mb. This should work identically to the old system for now.
2019-12-12 12:42:33 +00:00
modmuss50
39861db8b5 Fix #1874 2019-10-28 15:59:29 +00:00
modmuss50
2f9b154e22 Move to RC's fluid instance, closes #1826 2019-09-15 13:59:46 +01:00
modmuss50
d585b298fb Fix some issues with the fluid handling of items 2019-08-18 14:22:45 +01:00
drcrazy
6282e1f714 Filter fluids input for fluid generators. 2019-08-13 21:00:28 +03:00
modmuss50
83483ce8d3 Fluid replicator 2019-08-06 20:56:52 +01:00
modmuss50
70279c1800 More fluid work 2019-07-31 19:37:17 +01:00
drcrazy
80f2440323 Unused imports and Lightning rod 2019-07-25 15:20:57 +03:00
modmuss50
6a93c3fd46 more misc fluid work, gonna leave most of this untill we have an offical or new api 2019-07-24 19:06:21 +01:00
modmuss50
8964c5aceb Basic Dynamic cell rendering 2019-07-24 01:37:05 +01:00
modmuss50
9b46e3237e move to silk fluids 2019-07-23 21:30:57 +01:00
modmuss50
83bf6add1e Large amount of fluid work 2019-07-23 20:46:07 +01:00
modmuss50
7dc6dddc51 Refactor out inv wrapper 2019-07-01 00:39:13 +01:00
modmuss50
d18d1b820e 397 2019-06-04 12:05:18 +01:00
modmuss50
e8396dbc33 831, doesnt seem impossible 2019-05-27 22:21:58 +01:00
modmuss50
4e03ac893c 1147 - Initial auto mappings pass 2019-05-26 12:37:59 +01:00
drcrazy
97b517580a Fixed license 2019-03-01 18:59:11 +03:00
modmuss50
1c783abf9d Item fixes, it compiles :D 2019-02-23 19:13:57 +00:00
modmuss50
18b3535607 More fixes 637 2019-02-21 23:07:44 +00:00