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 |
|
drcrazy
|
7b672244c3
|
Ore spawn rates config. Closes #2087
|
2020-04-16 14:50:00 +03:00 |
|
modmuss50
|
95d237e880
|
#betaBuild
|
2020-04-11 15:47:11 +01:00 |
|
modmuss50
|
6c48584ae5
|
Fix #2083
|
2020-04-11 15:45:02 +01: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
|
c034ed0942
|
#releaseBuild
|
2020-04-11 15:38:16 +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 |
|
drcrazy
|
458a4b8e45
|
Fix cloaking device texture. Closes #2067
|
2020-04-09 14:51:12 +03:00 |
|
modmuss50
|
49e4941c46
|
#betaBuild
|
2020-04-09 01:53:17 +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 |
|
modmuss50
|
d8f7403f0e
|
#releaseBuild
|
2020-04-07 00:39:50 +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
|
36506aac6b
|
#releaseBuild
|
2020-03-26 21:38:10 +00:00 |
|
modmuss50
|
9344eeb0ca
|
Support latest energy version
|
2020-03-26 21:33:44 +00:00 |
|
modmuss50
|
333389c0d9
|
Merge remote-tracking branch 'origin/1.15' into 1.15
|
2020-03-26 11:27:13 +00:00 |
|
modmuss50
|
ba9d2bbb3b
|
Sodium explodes in water, closes #2069
|
2020-03-26 11:26:20 +00:00 |
|
modmuss50
|
4020019012
|
#betaBuild
|
2020-03-25 20:35:34 +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
|
0817b70f55
|
Update almandine dust textures
|
2020-03-13 16:28:24 -07: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
|
5b1e68d093
|
Support the new gold ore tag
|
2020-03-12 20:43:48 +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
|
21b0620d30
|
#releaseBuild
|
2020-03-06 12:38:49 +00:00 |
|
