maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5637 commits 1 branch 0 tags 80 MiB
Commit graph

766 commits

Author SHA1 Message Date
modmuss50
f7f8127ba0 Move some smelting and blasting recipes to data gen. 2021-12-03 17:34:42 +00:00
modmuss50
58423c560d Remove old scripts that were used to generate a lot of the existing data. 
If needed again they should be rewritten using the datagen mod.
 2021-12-03 16:00:41 +00:00
modmuss50
89b47b33fd Add base datagen sourceset 2021-12-03 15:58:43 +00:00
modmuss50
5c4a2587cb Update github api 2021-11-28 14:53:01 +00:00
modmuss50
c0c6724cd5 Update CF mc version. 2021-11-28 14:36:58 +00:00
modmuss50
1d148fc63e pre5 and REI 7 2021-11-21 11:50:00 +00:00
modmuss50
dd79effe80 Finish rubber trees. 2021-11-17 21:28:26 +00:00
modmuss50
4a2e81550f Port to 1.18-pre2 without worldgen 2021-11-16 22:38:31 +00:00
modmuss50
f5c3b85773 Update deps 2021-11-11 10:54:33 +00:00
modmuss50
cf80faebd5 Remove build number, only publish when manually built. 2021-10-22 19:53:06 +01:00
deirn
81c5759e88
Fix versioning (#2503) 2021-09-17 13:42:05 +01:00
modmuss50
8c6a0155e7 Add a basic gametest to test the grinder. 2021-09-01 23:08:42 +01:00
modmuss50
6c3b461e11 Fix build and update deps 2021-09-01 21:17:58 +01:00
Technici4n
3e2b0e11ae
Initial migration to V2 Energy API (#2474) 
* Initial Energy API refactor

* Allow charging in energy storage BEs

* Remove maven for experimental fabric

Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2021-09-01 21:14:15 +01:00
drcrazy
2bc4886cc0 Update Fabric API version and move versions to properties. 2021-08-19 13:33:26 +03:00
drcrazy
e81a924459 Fix autogeneration of blasting recipes. Closes #2432 2021-08-16 12:23:14 +03:00
drcrazy
32a24e3291 #betaBuild 2021-08-14 01:28:05 +03:00
drcrazy
38aaeabf3c Fix powered tools combat stats. Closes #2468 2021-08-12 17:22:43 +03:00
modmuss50
482fe4f01f Update Trinkets api 2021-07-23 00:43:57 +01:00
modmuss50
ff785a7e85 Bump version 2021-07-20 20:21:08 +01:00
modmuss50
838bb9b114 Fix with no changelog 2021-07-20 20:00:11 +01:00
modmuss50
1e895f1786 Add changelog generation 2021-07-20 19:59:04 +01:00
modmuss50
08e504a607 Update Gradle, loom. Give it more memory. 2021-07-20 19:15:03 +01:00
modmuss50
52357cff10 Publish reborn core jar to curseforge and TR's github 2021-07-20 19:10:11 +01:00
modmuss50
2ae5e8ff5b Finish 1.17.1 port 2021-07-20 19:01:38 +01:00
drcrazy
08a2cdb081 First pass on 1.17.1 update. 13 errors left 2021-07-20 03:38:43 +03:00
Yan Chubikov
8c57ae4a4e
DashLoader compatibility (#2453). Thanks to alphaqu 2021-07-16 00:59:12 +03:00
drcrazy
12765ae87f #betaBuild 2021-07-03 01:18:31 +03:00
drcrazy
5eef35551a Fix recipe outputs display in REI. Closes #2417 2021-07-03 01:11:18 +03:00
drcrazy
d85d746ef5 #betaBuild 2021-06-19 12:28:19 +03:00
drcrazy
88d5ee015a One Energy to rule them all. 2021-06-18 20:16:57 +03:00
drcrazy
78dbaa1842 #betaBuild 2021-06-14 12:18:11 +03:00
drcrazy
ad6b745154 Update REI dep 2021-06-14 12:11:54 +03:00
drcrazy
fcc89a2eaa Update version for dependencies 2021-06-11 02:34:56 +03:00
shedaniel
8243c936be
Update to REI 6 (#2404) 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-03 16:58:56 +01:00
modmuss50
d20265ba86 1.17-pre4 2021-06-02 20:45:19 +01:00
modmuss50
3e13cdb4a6 1.17-pre2 2021-05-31 17:41:07 +01:00
modmuss50
9315f78163 Include energy API 2021-05-31 12:42:56 +01:00
modmuss50
22a50d2ecd Remove signing, it doesnt provide us with much. 2021-05-29 13:55:51 +01:00
modmuss50
ec5ce65a3d Re-enable builds 2021-05-29 13:29:04 +01:00
modmuss50
b33f4be5f4 1.17: TechReborn compiles and runs, big thanks to @petabyteboy 
Co-authored-by: Milan Pässler <milan@petabyte.dev>
 2021-05-29 13:19:29 +01:00
modmuss50
9520a3e607 Migrate mappings, 1888 errors to go 2021-05-28 14:58:12 +01:00
modmuss50
b0c7a733c7 Move RebornCore into a sub project 
Update gradle and build against java 16
 2021-05-28 14:51:01 +01:00
Fourmisain
30769be822
fix relative path resolution in build script (#2390). Thanks to Fourmisain 2021-05-06 13:27:24 +03:00
Justin Vitale
ecdce6ea17 #betaBuild 2021-04-22 22:05:24 +10:00
drcrazy
81337c3698 #releaseBuild 2021-03-19 14:12:53 +03:00
drcrazy
ca19037b0b #releaseBuild 2021-02-24 13:20:30 +03:00
drcrazy
c99c1ed09f Release version 2021-02-15 00:19:14 +03:00
modmuss50
cf91ae20e7 Github actions 2021-02-08 19:58:47 +00:00
modmuss50
fa9d2f81ba #releaseBuild 2021-01-03 19:51:30 +00:00
drcrazy
b7fa791649 #releaseBuild 2020-12-28 14:42:18 +03:00
modmuss50
c4d9b43832 Update deps 2020-12-20 21:31:15 +00:00
drcrazy
9d4e25377a Fix crash with AE2 and FluidIngredient 2020-12-04 16:00:00 +03:00
modmuss50
67d82dfc66 #betaBuild 2020-11-09 19:17:50 +00:00
modmuss50
8919a3ea30 #betaBuild 2020-11-08 16:21:54 +00:00
drcrazy
d36a61be39 Update to release version of 1.16.4 2020-11-05 14:31:28 +03:00
modmuss50
416cd647a2 Dep updates 2020-10-30 21:02:41 +00:00
drcrazy
e20fbd8281 #releaseBuild 2020-10-27 15:24:13 +03:00
drcrazy
fff9dc3447 #releaseBuild 2020-10-26 21:01:59 +03:00
modmuss50
496af0ba43 Update loader and API 2020-10-09 19:36:53 +01:00
modmuss50
a44370f5e6 #releaseBuild 2020-09-19 16:52:19 +01:00
modmuss50
cf54e11893 Cleanup the build.gradle file, and add AE2 2020-09-19 15:18:07 +01:00
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