Commit graph

628 commits

Author SHA1 Message Date
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
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
f5cd992686 loom + loader + api updates 2020-06-01 22:06:56 +01:00
shedaniel
ed5478c8b7
Show tooltip only for TR items. Kudos to Shedaniel (#2122) 2020-05-26 14:52:58 +03:00
modmuss50
e1858aca8b #releaseBuild 2020-05-22 15:31:51 +01:00
modmuss50
a92d9a2529 Fix build 2020-05-22 15:28:59 +01:00
modmuss50
43d8759444 Remove towelette bug fix. 2020-05-22 15:27:54 +01:00
modmuss50
0b64c9f996 #betaBuild 2020-05-21 23:14:17 +01:00
modmuss50
8c39008636 20w21a 2020-05-21 23:00:12 +01:00
modmuss50
628b7424fa #releaseBuild 2020-05-03 00:15:08 +01:00
modmuss50
436a66ddfa #betaBuild 2020-05-03 00:05:56 +01:00
modmuss50
862db8a4ab 20w18a 2020-05-02 23:39:28 +01:00
modmuss50
ff6ee029fd #releaseBuild 2020-04-26 19:48:09 +01:00
modmuss50
bc98f2f758 #betaBuild 2020-04-26 19:47:55 +01:00
modmuss50
7ccd5bcebd 20w17a compile pass 2020-04-26 16:29:38 +01:00
modmuss50
95d237e880 #betaBuild 2020-04-11 15:47:11 +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
9612c82cd3 Display flying when an elytra is used with the trinkets mod. Closes #2074 2020-04-11 15:12:13 +01: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
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
11290e89e7 20w13a 2020-03-25 19:36:02 +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
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
adad632549 initial 20w11a 2020-03-12 20:32:03 +00:00
modmuss50
21b0620d30 #releaseBuild 2020-03-06 12:38:49 +00:00
modmuss50
a88d34b87f
improved rei compat (#2054) 2020-03-05 19:24:29 +00:00
modmuss50
785ef34450 #releaseBuild 2020-02-12 19:07:13 +00:00
modmuss50
dffec285b2 1.16 2020-02-12 18:36:01 +00: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
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
fb6ac9b3cd #releaseBuild 2020-01-28 21:15:33 +00:00
Prospector
6725fd30a1 Update to latest yarn 2020-01-21 22:00:54 -08:00
modmuss50
5d2569fa57 1.15.2 #releaseBuild 2020-01-21 15:44:14 +00:00
modmuss50
40cb57d451 #releaseBuild 2020-01-20 21:57:02 +00:00
modmuss50
f7c664fc25 Update mappings 2020-01-18 18:00:04 +00:00
modmuss50
d01ada5353 add developer-mode 2020-01-17 17:07:27 +00:00
modmuss50
2fb7436e4b 1.15.2-pre2 2020-01-16 19:52:18 +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
modmuss50
7247b60274 #releaseBuild 2020-01-10 23:34:47 +00:00
modmuss50
7b99e2e9b7 License updates + fixes 2020-01-03 22:46:07 +00:00
modmuss50
e3d13fae6f #releaseBuild 2020-01-03 22:30:30 +00:00