Commit graph

3617 commits

Author SHA1 Message Date
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
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
drcrazy
7b672244c3 Ore spawn rates config. Closes #2087 2020-04-16 14:50:00 +03:00
modmuss50
a6005851a7 Merge fixes 2020-04-11 15:42:09 +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
modmuss50
9612c82cd3 Display flying when an elytra is used with the trinkets mod. Closes #2074 2020-04-11 15:12:13 +01:00
modmuss50
8b16fe191b Fix #2070 2020-04-11 14:51:02 +01:00
modmuss50
1625920fef Add plant products to the Composter. Fixes #2075 2020-04-11 14:44:41 +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
294f4b5454 Rubber trees are less frequent and have configs. Closes #2079 2020-04-06 14:24:35 +03:00
drcrazy
0845b923b5 More fixes for unused configs 2020-04-06 14:05:44 +03:00
drcrazy
35e4675c6d Fix copper oregen config typo 2020-04-06 14:00:54 +03:00
modmuss50
49e1ce3c2e Add constructor that allows passing a custom Block.Settings 2020-03-31 23:14:03 +01:00
modmuss50
bb6ff90f9b Refactor guis 2020-03-31 10:40:19 +01:00
modmuss50
9344eeb0ca Support latest energy version 2020-03-26 21:33:44 +00:00
modmuss50
4482c01ad0 Tag renames 2020-03-25 20:29:56 +00:00
modmuss50
11290e89e7 20w13a 2020-03-25 19:36:02 +00:00
modmuss50
8679c9398f Merge remote-tracking branch 'origin/1.16' into 1.16 2020-03-23 20:21:08 +00:00
modmuss50
acf59dd1a5 Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts:
#	src/main/java/techreborn/init/TRContent.java
#	src/main/java/techreborn/items/armor/BatpackItem.java
2020-03-23 20:19:53 +00:00
shedaniel
8dae42d04a
Update REI to v4.1-unstable (#2063) 2020-03-19 14:23:52 +00:00
modmuss50
e4fb1773f3 20w12a 2020-03-18 20:58:31 +00:00
drcrazy
7138a8d45b Config for Oregen. Closes #2062 2020-03-18 17:20:48 +03:00
drcrazy
8f64355885 Buff Nano Saber damage. Closes #1714 2020-03-17 14:52:19 +03:00
Prospector
e3829cf44f Update some textures and rebalance a few recipes 2020-03-13 11:12:07 -07: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
f60daa7376 Merge remote-tracking branch 'origin/1.16' into 1.16
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/TRArmorMaterials.java
2020-03-12 20:32:39 +00:00
modmuss50
adad632549 initial 20w11a 2020-03-12 20:32:03 +00:00
drcrazy
416fbbf607 Allow to keep enchants only for TR items. Closes #1952 2020-03-10 13:51:34 +03:00
drcrazy
3e3ca8dd41 Enchants persist through crafting. Some work on #1952 2020-03-10 10:11:07 +03:00
modmuss50
f99d822cf2 Fix https://github.com/TechReborn/TechReborn/issues/2055 2020-03-06 12:26:48 +00:00
modmuss50
a88d34b87f
improved rei compat (#2054) 2020-03-05 19:24:29 +00:00
Milan
1de7b3afd2
20w08a (#2052)
* 20w08a

* update REI and libCD
2020-02-25 18:00:15 +00:00
drcrazy
af8bd7ae8c Bump Omni-tool damage. Closes #2043 2020-02-18 11:03:26 +03:00
modmuss50
dffec285b2 1.16 2020-02-12 18:36:01 +00:00
modmuss50
b0d3b3b77d Should fix #2033 2020-02-12 18:05:58 +00:00
drcrazy
b9a36270a6 Assembly machine got usage in REI. Closes #2034 2020-02-10 21:44:39 +03:00
drcrazy
c2f387f1ae AESU stores inventory correctly. Closes #2018 2020-02-10 21:33:21 +03:00
modmuss50
b9351e33a1 Should actually fix the treetap. Closes #2022 2020-01-29 15:17:28 +00:00
drcrazy
162e4bbbee Added quartz dust. Closes #2012 2020-01-27 16:30:30 +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
modmuss50
adf5c7aba2 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-01-26 18:18:04 +00:00
modmuss50
015d81ad24 Fix #2013 2020-01-26 18:17:56 +00:00
drcrazy
0eb89ee122 Drills use energy to mine. Closes #2007 2020-01-25 20:51:03 +03:00
drcrazy
1cb6623dd7 Review nanosaber config 2020-01-24 16:01:56 +03:00
drcrazy
9cccc70071 Review treetap, chainsaw and jackhammer configs 2020-01-24 12:54:37 +03:00