Commit graph

106 commits

Author SHA1 Message Date
modmuss50
b5707b144e Some general cleanup 2020-07-26 16:19:33 +01:00
modmuss50
18a08b798e Merge remote-tracking branch 'origin/1.16' into 1.16
# Conflicts:
#	src/main/java/techreborn/init/TRContent.java
2020-07-25 00:23:59 +01:00
modmuss50
65a15910cd Fix #2170 2020-07-25 00:12:39 +01:00
Justin Vitale
c4ef977f16 Refactor and import cleanup (Excluding network PR changed files) 2020-07-09 23:04:42 +10:00
Justin Vitale
a36a0e6f4a Check multiblock before crafting vacuum freezer 2020-07-09 22:55:00 +10:00
ramidzkh
4b2042a100
Deduplicate multiblock verification from BlockEntities and Guis (#2133)
* Deduplicate multiblock verification from BlockEntities and Guis

* Update REI

* Remove unneeded calls
2020-07-09 22:45:04 +10:00
Justin Vitale
c89d6941ae Get state from blockstate instead of saving it as NBT resin basin 2020-07-09 20:23:06 +10:00
Justin Vitale
48bf8ae0f2 Have chance to yield two sap closes #2014 2020-07-08 19:43:19 +10:00
Justin Vitale
e6e9b8bcfe Fix holding position, fix chat sending on server, drop sap if broken 2020-07-08 19:15:23 +10:00
Justin Vitale
80716876b2 Cleanup and drop when no log connected 2020-07-08 03:34:36 +10:00
Justin Vitale
7d04348853 Fix sound 2020-07-08 01:40:41 +10:00
Justin Vitale
856f66eeb0 Resin basin finished (Recipe, functionality, textures, models) 2020-07-08 01:06:34 +10:00
Justin Vitale
90c23b9d57 Refactor and cleanup, awaiting new model. 2020-07-02 17:20:50 +10:00
Justin Vitale
55fbcb712e Reference issue #2014 2020-07-02 02:38:51 +10:00
Justin Vitale
6dc00090d1 Add sapper base logic code (MVP) along with rest of it 2020-07-02 02:37:36 +10:00
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
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
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
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
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
Justin Vitale
5d89272a10 Add WIP textured drain block without logic 2020-01-04 16:18:34 +11: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
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
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
modmuss50
8b03986d15 Use RebornCore's ExtendedRecipeRemainder in the auto crafting table 2019-12-16 19:48:18 +00:00
modmuss50
bd81ca48f6 Auto crafting table fixes and improvements.
This now uses the same logic that the rolling machine uses to balance recipes.1.15
Fixes #1891
2019-12-13 10:39:53 +00:00
drcrazy
fff1b0c107 License + imports 2019-12-13 11:36:51 +03: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
4764271967 Fix #1900 2019-12-05 19:01:56 +00:00
modmuss50
d7cfbcd443 Cleanup 2019-11-28 17:15:46 +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
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