Commit graph

209 commits

Author SHA1 Message Date
Justin Vitale
704dc06961 Import cleanup and reorganization 2020-06-18 22:41:34 +10:00
Justin Vitale
390d9f7059 Merge branch '1.15' into 1.16
Need to fix up storage unit UI
2020-06-18 22:39:26 +10:00
Justin Vitale
025740d8ee
Drain block for liquid gathering
https://wiki.techreborn.ovh/doku.php?id=mods:techreborn:drain
2020-06-18 21:39:40 +10:00
drcrazy
c3d405e4f4
StorageUnitBlock: Implement locking mechanism (#2124). Thanks to Sturmlilie 2020-06-09 16:30:40 +03:00
modmuss50
ffc4c1643e 1.16-pre2 2020-06-05 16:03:22 +01:00
modmuss50
17453d7edd post merge compile fix 2020-06-01 22:25:51 +01:00
modmuss50
bbc4b2b765 Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/ModLoot.java
2020-06-01 22:25:00 +01:00
drcrazy
fdc6f88dbc Solar panels will work in Nether and The End. Closes #2105 2020-05-06 15:08:46 +03: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
55f9a5df52 20w15a 2020-04-09 01:47:11 +01:00
modmuss50
0bf6159801 Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/GuiHandler.java
2020-04-09 00:55:38 +01:00
drcrazy
0845b923b5 More fixes for unused configs 2020-04-06 14:05:44 +03:00
modmuss50
9344eeb0ca Support latest energy version 2020-03-26 21:33:44 +00:00
modmuss50
11290e89e7 20w13a 2020-03-25 19:36:02 +00:00
modmuss50
e4fb1773f3 20w12a 2020-03-18 20:58:31 +00:00
modmuss50
99b2755887 Renames to match yarn changes 2020-03-12 20:56:44 +00:00
modmuss50
e3749343e7 Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/compat/rei/MachineRecipeCategory.java
#	src/main/java/techreborn/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java
#	src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java
2020-03-12 20:33:54 +00:00
modmuss50
adad632549 initial 20w11a 2020-03-12 20:32:03 +00:00
modmuss50
f99d822cf2 Fix https://github.com/TechReborn/TechReborn/issues/2055 2020-03-06 12:26:48 +00:00
modmuss50
dffec285b2 1.16 2020-02-12 18:36:01 +00:00
drcrazy
c2f387f1ae AESU stores inventory correctly. Closes #2018 2020-02-10 21:33:21 +03:00
Kato
9e67ab5725 Check rubber logs for sap from the ground level. (#2015)
Rubber logs can be put down manually, and it's not a given that the most bottom log is at the greenhouse's level.  In practice, with the ground made up out of rubber logs, there will be sap on logs at y == 0.
2020-01-26 18:18:25 +00:00
drcrazy
74d96e4670 Fix hologram for distillation tower. 2020-01-21 16:29:10 +03:00
drcrazy
ae691fcfc5 LESU I\O logic change. Closes #1978 2020-01-21 01:52:52 +03:00
modmuss50
1202a1c588 1.15.2 - mainly mapping updates. Will be backwards compatible with 1.15.1 and 1.15 2020-01-15 12:07:52 +00:00
drcrazy
342043dbba Lineup batteries and energy storages. 2020-01-13 15:38:23 +03:00
modmuss50
7e6f0d1906 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-01-12 18:40:30 +00:00
modmuss50
bd25b11908 Turbine rendering, thanks Spearkiller for the textures and model 2020-01-12 18:40:21 +00:00
Justin Vitale
f2138e034f Fix for fix #1971- Accounted for <= 64 stacks thus not in stored stack 2020-01-12 09:18:48 +11:00
modmuss50
3b4d135fd4 Fix #1971 2020-01-11 13:29:22 +00:00
vhd
d1b395f3e4 Cables can now be covered. Thanks to vhd. Closes #1954 2020-01-10 18:07:02 +03:00
drcrazy
a115fbd736 Dispenser can use cells. Closes #1948 2020-01-10 16:09:03 +03:00
drcrazy
88c0aca954 Fix fusion reactor power gen. Closes #1961 2020-01-09 16:33:32 +03:00
drcrazy
f36c0cd3c6 Fix tank fluid tooltip. Closes #1958 2020-01-05 17:40:52 +03:00
Justin Vitale
5d89272a10 Add WIP textured drain block without logic 2020-01-04 16:18:34 +11:00
Justin Vitale
9aeddd204a WIP tag to interface, capacity spacing fix, removed Supercondensator
Sidenote: Also renamed DocumentAssistUtils to ToolTipAssistUtils.
2020-01-04 14:20:57 +11:00
modmuss50
7b99e2e9b7 License updates + fixes 2020-01-03 22:46:07 +00:00
drcrazy
f5360f8416 Fix tooltip for energy storage. 2020-01-03 17:20:50 +03: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
2fc9557516 Fix the LESU not working 2020-01-01 16:05:23 +00:00
vhd
52de2fc59f Added configurable recycler blacklist (#1934)
* Added configurable recycler blacklist. Defaulted to scrap and scrap_box

* Fix for bronze dust centrifuge dupe
2019-12-29 19:48:00 +00:00
vhd
4f45a63a7a [Proposal] Greenhouse Controller (aka Farming Station) (#1928)
* Added Greenhouse Controller (aka Farming Station)

* Greenhouse tiny code cleanup

* Greenhouse Controller can collect sap
2019-12-29 14:06:56 +00:00
drcrazy
a99acbfd41 Air is not a fuel. Closes #1922 2019-12-25 16:14:24 +03:00
drcrazy
a37a6e29a5 Fix electric furnace energy usage. Closes #1920 2019-12-25 03:49:11 +03:00
modmuss50
d4abd56a3c minor fix to the chunk loader 2019-12-24 21:41:41 +00:00
drcrazy
6dc1124bc6 Energy storage should drop inventory. Closes #1919 2019-12-23 13:06:18 +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