Commit graph

4863 commits

Author SHA1 Message Date
modmuss50
6c20fa69bf Fix #2137 2020-06-18 16:13:47 +01:00
modmuss50
483c5f4724 Merge remote-tracking branch 'remotes/origin/screeenhandler_pr' into 1.16
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/GuiType.java
2020-06-18 16:08:59 +01:00
modmuss50
32468c1c95 Merge remote-tracking branch 'origin/1.16' into 1.16 2020-06-18 15:56:16 +01:00
modmuss50
7b297b5c45 1.16 Release Candidate 1 2020-06-18 15:55:30 +01:00
Justin Vitale
4d91f08279 Merge remote-tracking branch 'origin/1.16' into 1.16 2020-06-18 23:29:59 +10:00
Justin Vitale
5171cd30e8 Fix in/out position and translation for percent on storage/tank unit 2020-06-18 23:29:52 +10:00
modmuss50
14075b0409 Fix #2135 2020-06-18 13:50:56 +01:00
modmuss50
71a0a631ff remove usages of reflection, should help cut down on errors and IDE warnings. 2020-06-18 13:50:50 +01:00
modmuss50
dc72e5ce39 1.16-pre8 2020-06-18 13:49:38 +01: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
Justin Vitale
f915c4619d Fix typo in basalt recipe 2020-06-13 16:58:07 +10:00
Justin Vitale
62fb5f632a Cobblestone > Gravel > Sand grinder flow #2107
Don't see anything inherently wrong with this, most packs do it this way anyways.
2020-06-13 00:47:38 +10:00
Justin Vitale
f66e7019f9 Basalt, marble, andesite and granite craftable #2046
basalt from coal & obsidian small dust
marble from diorite dust an obsidian small dust
andesite dust from andesite
granite dust from granite (no longer makes quartz)
2020-06-13 00:36:45 +10:00
Justin Vitale
10dc7b114e Diorite dust from diorite blocks instead of quartz #2046
Quartz dust can be crafted via quartz in grinder
2020-06-13 00:10:51 +10:00
Justin Vitale
8b548baf56 Compress prismarine crystals to shards (Reverse recipe) #2046 2020-06-12 22:07:49 +10:00
drcrazy
4e17c87ca4 Updated FabricBlockSettings 2020-06-09 17:02:06 +03: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
ae1a26156a 20w22a 2020-06-01 22:37:43 +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
modmuss50
f5cd992686 loom + loader + api updates 2020-06-01 22:06:56 +01:00
shedaniel
ed5478c8b7
Show tooltip only for TR items. Kudos to Shedaniel (#2122) 2020-05-26 14:52:58 +03:00
modmuss50
3e2753affb Example of using the WIP Screen handler API 2020-05-25 12:55:08 +01:00
modmuss50
e1858aca8b #releaseBuild 2020-05-22 15:31:51 +01:00
modmuss50
a92d9a2529 Fix build 2020-05-22 15:28:59 +01:00
modmuss50
43d8759444 Remove towelette bug fix. 2020-05-22 15:27:54 +01:00
modmuss50
0b64c9f996 #betaBuild 2020-05-21 23:14:17 +01:00
modmuss50
8c39008636 20w21a 2020-05-21 23:00:12 +01:00
drcrazy
fdc6f88dbc Solar panels will work in Nether and The End. Closes #2105 2020-05-06 15:08:46 +03:00
drcrazy
2e67d56225 Saplings are back in Overworld chests. Some work on #2100 2020-05-06 14:43:19 +03:00
drcrazy
273401473c Fix quantum tank advancement. Closes #2096 2020-05-04 13:38:38 +03:00
modmuss50
628b7424fa #releaseBuild 2020-05-03 00:15:08 +01:00
modmuss50
436a66ddfa #betaBuild 2020-05-03 00:05:56 +01:00
modmuss50
f5d8cd2f53 Rework rubber tree generation 2020-05-03 00:04:55 +01:00
modmuss50
862db8a4ab 20w18a 2020-05-02 23:39:28 +01:00
modmuss50
ff6ee029fd #releaseBuild 2020-04-26 19:48:09 +01:00
modmuss50
bc98f2f758 #betaBuild 2020-04-26 19:47:55 +01: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
178e0937d5 Fix bad merge 2020-04-26 00:34:23 +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
e8a6d801f9 Fix #2097 2020-04-25 23:57:09 +01:00
Sturmlilie
d68888df57
Blockus compatibility (1.15+) (#2091)
* Balance marble dust centrifuge input/output item counts

* Add recipes using blockus items
2020-04-25 14:48:56 +01:00
Sturmlilie
4fe8f5381a
Allow grinding of vanilla basalt blocks (#2094) 2020-04-20 14:08:17 +01:00
drcrazy
350d1fada6 More usage of rubber wood 2020-04-17 14:54:48 +03:00
haykam821
99a2a28d91
Add rubber wood and stripped rubber wood (#2086). Thanks to haykam821
* Make rubber wood block names consistent with vanilla
* Add rubber wood
* Add stripped rubber wood
* Add block and item tags for rubber logs
* Allow crafting all types of rubber logs into rubber planks
* Allow extracting rubber from rubber wood and stripped rubber wood
2020-04-17 14:28:59 +03:00