Commit graph

40 commits

Author SHA1 Message Date
modmuss50
bd25b11908 Turbine rendering, thanks Spearkiller for the textures and model 2020-01-12 18:40:21 +00:00
drcrazy
88c0aca954 Fix fusion reactor power gen. Closes #1961 2020-01-09 16:33:32 +03:00
modmuss50
7b99e2e9b7 License updates + fixes 2020-01-03 22:46:07 +00:00
drcrazy
a99acbfd41 Air is not a fuel. Closes #1922 2019-12-25 16:14:24 +03:00
Justin Vitale
3dbc7feb62 #1913 Improved in-game documentation via tooltips for both machines & upgrades and solar panel exception fix (#1917)
* Overclocker and energy storage tooltip added

* Add default constructor to fix NoSuchMethodException

java.lang.NoSuchMethodException when loading world with existing solar panels

* Base Upgrade tooltips (Might move to reborn core)

* Migrated to tooltip callback and added most machine infos

* Optimize imports of stuff previously touched

* Added more informationtips and cleanup

* Revert itemUpgrade formatting

* Final touches

* Readd easter eggs, multi-line tips and translation updates

Easter egg tooltips are now restricted to only ctrl-hover
2019-12-22 22:53:01 +00:00
Justin Vitale
b2f4804987 Solar panel GUI & internal storage plus misc spelling fixes (#1912)
* Solar panel GUI & internal storage plus misc spelling fixes

* Pullrequest fixes and recipe changes
2019-12-20 12:53:23 +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
d7cfbcd443 Cleanup 2019-11-28 17:15:46 +00:00
modmuss50
bfdde04892 1.15-pre2 loads of new mappings 2019-11-26 19:03:36 +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
31962e9bf2 Fix #1872 2019-10-28 15:53:39 +00: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
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
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
2f9b154e22 Move to RC's fluid instance, closes #1826 2019-09-15 13:59:46 +01:00
modmuss50
8c9c736da9 19w37a 2019-09-12 16:55:41 +01:00
modmuss50
4f80a8c651 start on new power api 2019-09-10 14:09:15 +01:00
modmuss50
a19c25a504 Fixes #1812 2019-08-26 20:11:55 +01:00
drcrazy
154dff4cbf Unused imports + warnings ) 2019-08-22 01:23:32 +03:00
drcrazy
6282e1f714 Filter fluids input for fluid generators. 2019-08-13 21:00:28 +03:00
drcrazy
8f94d3484b Should fix Plasma Generator for #1780 2019-08-13 19:43:36 +03:00
modmuss50
ff8b497c54 Fix thermal generator 2019-08-13 11:45:25 +01:00
modmuss50
77eee6f5b4 Move configs to one class 2019-08-12 17:57:00 +01:00
modmuss50
1cc1b25aee remove configured access, make it the default on all inv's 2019-08-06 20:33:46 +01:00
modmuss50
c60a279876 Rubber tree fixes and fixes to the solid fuel generator 2019-08-06 20:29:05 +01:00
drcrazy
0dd2f078ba Fix build and recipe 2019-08-01 21:05:42 +03:00
modmuss50
70279c1800 More fluid work 2019-07-31 19:37:17 +01:00
drcrazy
4e1dfa0018 Translation for solar panels 2019-07-26 15:22:48 +03:00
drcrazy
d76d637781 Fix solar panel loading NPE 2019-07-26 15:12:47 +03: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
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
1e52477b9e small fixes 2019-07-23 17:51:38 +01:00
modmuss50
dbc89adaf7 Tile -> BlockEntity + some more refactors 2019-07-22 12:45:13 +01:00