Commit graph

39 commits

Author SHA1 Message Date
modmuss50
31e7b357dc Use modern java features where we can, optimise imports. 2021-05-29 20:32:05 +01:00
modmuss50
b33f4be5f4 1.17: TechReborn compiles and runs, big thanks to @petabyteboy
Co-authored-by: Milan Pässler <milan@petabyte.dev>
2021-05-29 13:19:29 +01:00
Justin Vitale
d12b31bfe4 fix #2318 - Ensure registry result is not null before rendering. 2021-01-15 00:45:42 +11:00
drcrazy
342917851b Fix license 2020-10-21 01:37:31 +03:00
modmuss50
19f7e17f7d 1.16.3 - just mappings 2020-09-19 14:30:12 +01:00
modmuss50
46fe49ebe5 Fix ore gen 2020-08-02 14:05:52 +01:00
modmuss50
619fd39df3 Mappings update 2020-08-02 13:44:25 +01:00
modmuss50
b5707b144e Some general cleanup 2020-07-26 16:19:33 +01:00
shedaniel
01663648c4
Epic REI displays. Thanks to shedaniel! (#2167)
* Epic REI displays

Signed-off-by: shedaniel <daniel@shedaniel.me>

* use the AbstractEnergyConsumingMachineCategory for ElectrolyzerCategory

Signed-off-by: shedaniel <daniel@shedaniel.me>
2020-07-18 18:58:35 +03:00
Justin Vitale
c4ef977f16 Refactor and import cleanup (Excluding network PR changed files) 2020-07-09 23:04:42 +10:00
Justin Vitale
704dc06961 Import cleanup and reorganization 2020-06-18 22:41:34 +10:00
modmuss50
8051e0cfbb Fix some issues 2020-04-26 19:39:06 +01:00
modmuss50
7ccd5bcebd 20w17a compile pass 2020-04-26 16:29:38 +01:00
modmuss50
71d88ae44a Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts:
#	src/main/java/techreborn/events/ModRegistry.java
2020-04-26 00:28:17 +01:00
modmuss50
047c57c918 fix license warnings 2020-04-26 00:22:24 +01:00
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
e6533f0a97 Fix #2084 2020-04-11 15:27:24 +01:00
shedaniel
8dae42d04a
Update REI to v4.1-unstable (#2063) 2020-03-19 14:23:52 +00:00
modmuss50
a88d34b87f
improved rei compat (#2054) 2020-03-05 19:24:29 +00:00
drcrazy
b9a36270a6 Assembly machine got usage in REI. Closes #2034 2020-02-10 21:44:39 +03:00
vhd
f1731fe925 Slightly better REI fluid handling. (#1968)
- now you can jump between fluid/cells/buckets when looking for recipes
2020-01-10 21:05:05 +00:00
modmuss50
7b99e2e9b7 License updates + fixes 2020-01-03 22:46:07 +00:00
vhd
f7661681bc Temporary fix for REI fluid cells integration (#1921) 2019-12-24 22:15:40 +00:00
vhd
6918f8dd60 REI integration for fluid generators (#1916) 2019-12-22 17:58:58 +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
shedaniel
16fe02f359 FIx REI Compat for 1.15 snapshots (#1888) 2019-11-15 17:17:06 +00:00
shedaniel
8ecfa4207a Some REI Compat Changes (#1882)
* Update REi

* Update to 3.2.6
2019-11-07 14:46:19 +00:00
modmuss50
68c5e1637d Revert "Fix #1854"
This reverts commit 5338898a
2019-10-30 15:35:09 +00:00
modmuss50
5338898ae3 Fix #1854 2019-10-28 16:04:29 +00:00
drcrazy
f4e29cf9cb Warnings and Updated textures 2019-09-24 13:35:26 +03:00
modmuss50
2f9b154e22 Move to RC's fluid instance, closes #1826 2019-09-15 13:59:46 +01:00
drcrazy
66e8652c87 REI support for two new machines 2019-08-23 14:12:31 +03:00
drcrazy
f3cdd131a0 Show fluids in REI. Why water is so weird? 2019-08-23 01:40:14 +03:00
drcrazy
154dff4cbf Unused imports + warnings ) 2019-08-22 01:23:32 +03:00
drcrazy
fee7d69919 Add heat to REI 2019-08-20 03:44:54 +03:00
drcrazy
5bac19e302 tags for rolling machine + some REI polishing 2019-08-20 00:01:38 +03:00
Daniel She
f0b8d99853 Update to REI 3.0-pre (#1793)
* Update to REI 3.0-pre

* Update fabric.mod.json
2019-08-19 14:26:47 +01:00
drcrazy
3eec5bcb5b Added some recipe texts to REI. Looks ugly 2019-08-16 14:18:48 +03:00
modmuss50
eca7aaa34f add a Towelette plugin to blacklist our fluids, fixes the game not loading 2019-08-13 16:24:24 +01:00