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
drcrazy
b972de847a
#releaseBuild
2019-12-26 15:32:52 +03:00
Justin Vitale
58f48c44c9
50 advancements and other minor changes ( #1927 )
...
* Advancements!!!!!!!11111elevenoneone
* Update REI from 3.2.25 to 3.2.31
2019-12-26 15:07:34 +03:00
modmuss50
1f0fa709bc
Bump version
2019-12-17 02:00:12 +00:00
modmuss50
801693cedc
#releaseBuild
2019-12-16 20:14:39 +00:00
modmuss50
86fdbae7b2
Cleanup maven pom, hopefully I havent broken anything.
2019-12-16 18:56:19 +00:00
drcrazy
9b496c0a1a
Update fabric-api, rei, towelette
2019-12-16 18:34:18 +03:00
modmuss50
0d5f37c6b7
#releaseBuild
2019-12-15 19:46:36 +00:00
modmuss50
e171d0eabc
Remove duplicate annotations.
2019-12-13 10:00:59 +00:00
modmuss50
dd2125158d
fix config issues
2019-12-13 09:50:21 +00:00
modmuss50
2fe94ddbf0
Update gradle versions
2019-12-11 15:30:52 +00:00
modmuss50
baa96d8877
Updates
2019-12-11 14:28:39 +00:00
modmuss50
b1f3cbf1c6
#betaBuild
2019-12-10 07:34:39 +00:00
Meredith Espinosa
649d28d63c
update to new libcd! ( #1902 )
2019-12-10 07:31:32 +00:00
modmuss50
b74d46101b
Fix #1875
2019-12-08 22:40:29 +00:00
modmuss50
84e6246890
#betaBuild
2019-12-04 17:58:26 +00:00
modmuss50
e48d1f1184
Pre 4 mappings
2019-12-04 16:49:53 +00:00
modmuss50
eebdf9a4b5
#betaBuild
2019-11-26 20:49:05 +00:00
modmuss50
bfdde04892
1.15-pre2 loads of new mappings
2019-11-26 19:03:36 +00:00
modmuss50
937b184ace
Update fabric
2019-11-22 21:41:13 +00:00
modmuss50
6cb919b9a2
Fix rubber trees #betaBuild
2019-11-22 21:05:40 +00:00
modmuss50
d6935ff09d
#betaBuild
2019-11-21 22:16:15 +00:00
modmuss50
bc57e38828
Merge remote-tracking branch 'origin/1.15' into 1.15
2019-11-21 21:51:38 +00:00
modmuss50
c8ce611841
1.15-pre1
2019-11-21 21:51:30 +00:00
shedaniel
16fe02f359
FIx REI Compat for 1.15 snapshots ( #1888 )
2019-11-15 17:17:06 +00:00
modmuss50
977ac8f8a8
merge fixes
2019-11-14 19:09:32 +00:00
modmuss50
d5e89c5e20
Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/blocks/misc/BlockRubberLog.java
2019-11-14 19:03:36 +00:00
modmuss50
a984263b04
inital 19w46a port
2019-11-14 18:37:42 +00:00
shedaniel
8ecfa4207a
Some REI Compat Changes ( #1882 )
...
* Update REi
* Update to 3.2.6
2019-11-07 14:46:19 +00:00
drcrazy
7d17823b55
Bump dependencies
2019-11-01 16:47:23 +03:00
modmuss50
1b35ef88ee
#releaseBuild
2019-10-30 15:36:13 +00:00
modmuss50
99ad05f772
#releaseBuild
2019-10-28 21:13:25 +00:00
modmuss50
696fe65edd
#releaseBuild
2019-10-26 22:06:50 +01:00
modmuss50
14f09886f7
Update libs
2019-10-25 11:58:08 +01:00
modmuss50
79c17600b0
Tweak TR build script, remove some broken things
2019-10-18 19:42:15 +01:00
modmuss50
0cfcfc5f20
#releaseBuild
2019-10-12 19:21:58 +01:00
Meredith Espinosa
989e4601af
Add LibCD Support ( #1851 )
...
* First ugly commit for LibCD support
* fix all the ugly hacks, add rolling machine + fluid gen recipes
* be a bit more lenient with fluid generator names
* add test script, fix a few bugs
* get rid of ShapedRecipeSerializer stuff that's no longer needed
* Add a warning to the sample script
2019-10-11 21:30:26 +01:00
modmuss50
5f32f4dfda
#releaseBuild
2019-09-26 14:46:54 +01:00
modmuss50
b5650bfa2c
#betaBuild
2019-09-22 15:27:40 +01:00
modmuss50
b70a938796
Cables can now pull energy out of other mods blocks.
2019-09-22 14:17:46 +01:00
modmuss50
3fe62e2c77
19w38b
2019-09-21 13:01:38 +01:00
modmuss50
2d8961589d
Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/client/render/DynamicBucketBakedModel.java
# src/main/java/techreborn/client/render/DynamicCellBakedModel.java
2019-09-21 12:36:37 +01:00
modmuss50
0a7b501511
#betaBuild
2019-09-20 23:12:10 +01:00
modmuss50
d4d55922ca
quick fix for translations
2019-09-20 20:53:28 +01:00
drcrazy
989acffd4e
Bump REI version slightly
2019-09-18 15:45:15 +03:00
modmuss50
a4a578917d
Update energy api
2019-09-16 23:11:56 +01:00
modmuss50
7e05b0da12
Merge branch 'power' into 1.14.4
2019-09-15 19:15:39 +01:00
modmuss50
aa6eb60d46
Finish porting to new power api
2019-09-15 19:14:42 +01:00
modmuss50
e39e6e9070
#betaBuild
2019-09-15 15:56:55 +01:00
modmuss50
09f7fe2427
Possibly fix build? should be able to undo this after 1 build
2019-09-15 14:27:58 +01:00
modmuss50
2f9b154e22
Move to RC's fluid instance, closes #1826
2019-09-15 13:59:46 +01:00
modmuss50
fcfd387bc0
Semver + include RC Closes #1831
2019-09-15 13:43:04 +01:00
modmuss50
168dc30314
#alphaBuild
2019-09-12 17:00:21 +01:00
modmuss50
6e53132c59
Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
2019-09-12 16:55:52 +01:00
modmuss50
8c9c736da9
19w37a
2019-09-12 16:55:41 +01:00
modmuss50
cc51e9b016
#betaBuild
2019-09-10 14:24:26 +01:00
modmuss50
4f80a8c651
start on new power api
2019-09-10 14:09:15 +01:00
modmuss50
1cc56ed2e3
#alphaBuild
2019-08-28 00:20:08 +01:00
modmuss50
4a5fe76323
19w34a
2019-08-27 23:58:42 +01:00
modmuss50
2b28281d90
#betaBuild
2019-08-26 20:25:41 +01:00
modmuss50
b8def12639
#betaBuild
2019-08-21 19:51:55 +01:00
modmuss50
2c87620649
Clean up old maven repos, to try and fix build
2019-08-21 19:48:59 +01:00
modmuss50
05d95915e5
Dont jar in jar, it breaks some stuff
2019-08-19 20:41:30 +01:00
modmuss50
39ea95ec9e
#betaBuild
2019-08-19 20:39:53 +01:00
modmuss50
0d0d2b23d5
Include RC in the TR jar
2019-08-19 20:24:31 +01:00
Daniel She
f0b8d99853
Update to REI 3.0-pre ( #1793 )
...
* Update to REI 3.0-pre
* Update fabric.mod.json
2019-08-19 14:26:47 +01:00
modmuss50
d7d7eeb2ed
#betaBuild
2019-08-18 16:04:58 +01:00
modmuss50
047e4b7401
#betaBuild
2019-08-13 22:11:45 +01:00
modmuss50
bedae13e2a
#betaBuild
2019-08-13 16:30:44 +01:00
modmuss50
eca7aaa34f
add a Towelette plugin to blacklist our fluids, fixes the game not loading
2019-08-13 16:24:24 +01:00
drcrazy
54813ecdc3
Bumped modloader + recipes + lang for buckets
2019-08-13 13:51:44 +03:00
modmuss50
c17c49249a
#betaBuild
2019-08-12 23:47:10 +01:00
modmuss50
2a5708b328
Rolling machine port/fixes
2019-08-12 15:05:49 +01:00
modmuss50
a906fad739
#betaBuild
2019-08-09 00:26:47 +01:00
modmuss50
2edffead05
update to use fabric api's offical event
2019-08-08 23:35:27 +01:00
modmuss50
861e79a398
#betaBuild
2019-08-08 13:52:02 +01:00
modmuss50
a7d069d48c
Fix build
2019-08-08 13:47:59 +01:00
modmuss50
4c25ba221c
#betaBuild
2019-08-07 21:40:42 +01:00
modmuss50
c7a0bb6aec
#betaBuild
2019-08-07 20:29:00 +01:00
modmuss50
e4136f547d
Fix version not being set in the mod.json + some clean up
2019-08-06 23:42:25 +01:00
modmuss50
e1112a5cff
Fix build
2019-08-06 23:06:55 +01:00
modmuss50
0dc2636046
Final build fixes
2019-07-25 14:35:27 +01:00
modmuss50
7bf0e4f08a
Fix build?
2019-07-25 14:16:30 +01:00
modmuss50
52da17dfd5
Start on REI support, very basic right now, but it will help a lot when adding recipes.
2019-07-25 13:14:46 +01:00
modmuss50
9b46e3237e
move to silk fluids
2019-07-23 21:30:57 +01:00
modmuss50
50c13bafdc
1.14.4
2019-07-22 11:31:24 +01:00
modmuss50
e26d1edc52
Configs
2019-07-10 21:56:22 +01:00
modmuss50
18950e0b29
1.14.3 + more recipe fixes
2019-07-01 00:24:12 +01:00
modmuss50
f8f20ce6ba
1.14.2
2019-06-13 13:14:11 +01:00
modmuss50
4479116d1c
Add a tooltip event to fix the tooltips
2019-06-12 22:27:09 +01:00
modmuss50
e8396dbc33
831, doesnt seem impossible
2019-05-27 22:21:58 +01:00
modmuss50
4e03ac893c
1147 - Initial auto mappings pass
2019-05-26 12:37:59 +01:00
drcrazy
5c309c8b3d
Updated forge to 1.13.2 - 25.0.191. Removed unused imports
2019-04-26 17:37:10 +03:00
drcrazy
c122a480e5
Updated forge and mappings
2019-04-01 17:22:59 +03:00
modmuss50
f9efc72c99
Update forge
2019-03-05 14:28:42 +00:00
modmuss50
ff1370a3fd
Fix opening guis, still needs some work, but atleast it works now
2019-03-02 18:45:33 +00:00
modmuss50
001dd9ac74
Basic work on the genResources task
2019-03-01 21:24:26 +00:00
modmuss50
db3a6f2c7e
Enough to get the game running
2019-02-23 23:51:37 +00:00
modmuss50
fd0fa8c66e
Bunch of item work, 96
2019-02-22 15:02:41 +00:00
drcrazy
647b126c98
Updated mappings
2019-02-22 14:36:13 +03:00
modmuss50
df8c2cd34b
1.13.2
2019-02-20 20:27:03 +00:00
drcrazy
5bc08557b3
Migration work on TR armor
2019-02-20 23:12:36 +03:00
modmuss50
368e2d48df
2123 - Gradle setup
2019-01-12 19:56:42 +00:00
