Commit graph

654 commits

Author SHA1 Message Date
modmuss50
19f7e17f7d 1.16.3 - just mappings 2020-09-19 14:30:12 +01:00
modmuss50
7c4da6e306 #releaseBuild 2020-09-09 22:05:22 +01:00
modmuss50
4b6036530c Remove LibCD support due to it needing a rewirite.
I will happyily accept a PR to bring this back, right now I dont have the time to do so and its causing major issues (hard crashes)
2020-09-09 17:57:43 +01:00
modmuss50
82c0722066 #releaseBuild 2020-09-04 20:49:38 +01:00
modmuss50
ef775af6b8
#releaseBuild 2020-08-15 14:58:20 +01:00
modmuss50
d05ae874bd Revert "Revert later, fix build"
This reverts commit 5bd9e826
2020-08-14 08:44:06 +01:00
modmuss50
62ca298bc8 1.16.2 #releaseBuild 2020-08-12 08:45:22 +01:00
modmuss50
5bd9e82690 Revert later, fix build 2020-08-12 08:45:15 +01:00
modmuss50
bd88aabe68 Merge remote-tracking branch 'origin/1.16' into 1.16 2020-08-12 08:36:56 +01:00
modmuss50
6e001dd9cc 1.16.2-rc1 2020-08-07 21:51:48 +01:00
modmuss50
619fd39df3 Mappings update 2020-08-02 13:44:25 +01:00
modmuss50
6e0fc6af61 first pass on 1.16.2 - no world gen 2020-07-29 19:42:39 +01:00
Deximus-Maximus
a0644ac434
AutoSwitch support (#2175). Thanks to dexman545 2020-07-28 15:13:19 +03:00
modmuss50
70dedfdaa3 #releaseBuild 2020-07-25 14:34:51 +01:00
modmuss50
bbe2347a8c #releaseBuild 2020-07-25 00:28:16 +01:00
modmuss50
18a08b798e Merge remote-tracking branch 'origin/1.16' into 1.16
# Conflicts:
#	src/main/java/techreborn/init/TRContent.java
2020-07-25 00:23:59 +01:00
modmuss50
40f1136d33 update fabric api and loader 2020-07-24 23:53:54 +01:00
shedaniel
01663648c4
Epic REI displays. Thanks to shedaniel! (#2167)
* Epic REI displays

Signed-off-by: shedaniel <daniel@shedaniel.me>

* use the AbstractEnergyConsumingMachineCategory for ElectrolyzerCategory

Signed-off-by: shedaniel <daniel@shedaniel.me>
2020-07-18 18:58:35 +03:00
Justin Vitale
7eab187bbb #betaBuild 2020-07-09 19:11:11 +10:00
modmuss50
ec20d3eb93 Dont use --refresh-dependencies on everybuild 2020-06-28 16:29:46 +01:00
modmuss50
4c400dd9a4 #releaseBuild 2020-06-24 17:33:41 +01:00
modmuss50
a7d68e63cb 1.16.1 2020-06-24 17:30:20 +01:00
Justin Vitale
608ee810f7 #betaBuild 2020-06-24 14:31:57 +10:00
modmuss50
07f06cb27a #releaseBuild 2020-06-21 13:55:39 +01:00
modmuss50
7b297b5c45 1.16 Release Candidate 1 2020-06-18 15:55:30 +01:00
modmuss50
dc72e5ce39 1.16-pre8 2020-06-18 13:49:38 +01: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
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