Commit graph

3593 commits

Author SHA1 Message Date
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
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
modmuss50
147eec26f6 Fix missed mapping. #releaseBuild 2020-01-21 15:50:33 +00:00
drcrazy
f3333832ac Review Drills configs 2020-01-21 16:56:08 +03:00
drcrazy
74d96e4670 Fix hologram for distillation tower. 2020-01-21 16:29:10 +03:00
drcrazy
d023329de9 Quantum chest now extinguish fire. 2020-01-21 15:19:59 +03:00
drcrazy
ae691fcfc5 LESU I\O logic change. Closes #1978 2020-01-21 01:52:52 +03:00
modmuss50
3ca34f79a5 Gui tabs cleanup 2020-01-20 21:56:05 +00:00
modmuss50
f7c664fc25 Update mappings 2020-01-18 18:00:04 +00:00
modmuss50
1202a1c588 1.15.2 - mainly mapping updates. Will be backwards compatible with 1.15.1 and 1.15 2020-01-15 12:07:52 +00:00
drcrazy
a543a562b2 Fix industrial jackhammer AOE mining. Closes #1975 2020-01-14 02:22:06 +03:00
drcrazy
342043dbba Lineup batteries and energy storages. 2020-01-13 15:38:23 +03:00
drcrazy
b9c8a1a215 Slight cleanup. Energy packs uses transfer rates from tier. 2020-01-13 13:53:36 +03:00
Prospector
04a1c789c4 Seriously clean up loads of unnecessary item classes and add more configs 2020-01-12 21:20:42 -08:00
Prospector
960b064b5a Fix various issues relating to armor [Fixes #1952] 2020-01-12 19:17:35 -08:00
modmuss50
7e6f0d1906 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-01-12 18:40:30 +00:00
modmuss50
bd25b11908 Turbine rendering, thanks Spearkiller for the textures and model 2020-01-12 18:40:21 +00:00
Justin Vitale
f2138e034f Fix for fix #1971- Accounted for <= 64 stacks thus not in stored stack 2020-01-12 09:18:48 +11:00
modmuss50
3b4d135fd4 Fix #1971 2020-01-11 13:29:22 +00:00
modmuss50
c1097a5cd8 Get the light from infront of the storage unit 2020-01-11 13:18:21 +00:00
Justin Vitale
d728cd70d8
Merge pull request #1972 from vhd/bugfix/reinforced-glass-rendering
Fix reinforced glass rendering
2020-01-11 22:15:51 +11:00
vhd
9dc063e153 Fix reinforced glass rendering 2020-01-11 11:49:22 +02:00