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
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
43d8759444
Remove towelette bug fix.
2020-05-22 15:27:54 +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
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
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
drcrazy
7b672244c3
Ore spawn rates config. Closes #2087
2020-04-16 14:50:00 +03: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
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
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
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
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
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
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
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
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
modmuss50
015d81ad24
Fix #2013
2020-01-26 18:17:56 +00:00
drcrazy
8f5318b6bb
Nerf glowstone grinder recipe.
2020-01-25 20:53:50 +03: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
modmuss50
a06afa1a4a
Redstone config polish
2020-01-23 13:53:16 +00:00
modmuss50
3b2da8b510
Merge remote-tracking branch 'origin/1.15' into 1.15
2020-01-22 16:20:42 +00:00
modmuss50
04b8b2f266
Possibly fix 1.15.1 support. Should fix #1989
2020-01-22 16:19:26 +00:00
Prospector
6725fd30a1
Update to latest yarn
2020-01-21 22:00:54 -08:00