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
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
3920ff79d9
End crystals can be used in implosion compressor. Closes #2027
2020-02-22 12:58:26 +03:00
drcrazy
ebc2282c9f
Added recipe fo flint dust from flint in grinder. Closes #2044
2020-02-18 14:12:32 +03:00
drcrazy
af8bd7ae8c
Bump Omni-tool damage. Closes #2043
2020-02-18 11:03:26 +03:00
drcrazy
6824caa3f5
Tags for most of ingredients. Thanks to justastranger
2020-02-18 10:49:42 +03:00
modmuss50
785ef34450
#releaseBuild
2020-02-12 19:07:13 +00: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
Jessi Aurora
89aa42e62d
Recipe to get quartz dust from various sources/products of quartz ( #2038 ). Thanks to Jessifir
...
* Add quartz to quartz dust recipe to grinder
* Add grinder recipe to produce quarts dust from diorite
* Add grinder recipe to produce quarts dust from granite
* Add grinder recipe to produce quarts dust from quartz blocks
2020-02-12 11:56:39 +03:00
Jessi Aurora
eec531465b
Add (vanilla) blasting recipes for ores/dusts ( #2039 ). Thanks to Jessifir
...
* Add (vanilla) blasting recipes for all ores/dusts that can be smelted in a furnace
2020-02-12 11:54:51 +03: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
Jessi Aurora
bc0af95053
Fix potential abuse with golden apple recipes ( #2029 ). Thanks to Jessifir
2020-02-06 17:01:03 +03:00
modmuss50
fdda671b63
#releaseBuild
2020-01-30 14:00:15 +00:00
modmuss50
93e1107eba
test
2020-01-30 13:56:43 +00:00
modmuss50
4d94bd8221
Test commit
2020-01-30 13:48:01 +00:00
modmuss50
b9351e33a1
Should actually fix the treetap. Closes #2022
2020-01-29 15:17:28 +00:00
modmuss50
fb6ac9b3cd
#releaseBuild
2020-01-28 21:15:33 +00:00
drcrazy
162e4bbbee
Added quartz dust. Closes #2012
2020-01-27 16:30:30 +03:00
drcrazy
bb206e9f41
Steel could be made with carbon cell. Some work on #2012
2020-01-27 12:22:45 +03:00
drcrazy
16ca412227
Steel could be made with carbon cell. Some work on #2012
2020-01-27 12:22:19 +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
