266 Commits
Author SHA1 Message Date
Martin Robertz efa19eb7e1 Merge pull request #25 from chochem/fix-infcat
Fix infcat (EC2 cleanup)
1.32
2023-02-12 01:03:13 +01:00
chochem 65a4085bdd sa 2023-02-11 23:51:42 +00:00
chochem 8769d213a4 fix infcat 2023-02-11 23:51:05 +00:00
Raven Szewczyk 3792c04729 [ci skip] upgraded build system 2023-01-31 09:50:59 +00:00
Jason Mitchell 261616b1a5 [ci skip] Add git-blame-ignore-revs for spotlessApply 2023-01-29 12:04:26 -08:00
Jason Mitchell f32734a481 [ci skip] spotlessApply with the new settings 2023-01-29 12:04:26 -08:00
Jason Mitchell da5cb1f6fb [ci skip] Update buildscript to RetroFuturaGradle 2023-01-29 12:03:54 -08:00
Martin Robertz a1464ad788 Merge pull request #24 from LionZXY/patch-1
Change shader version from 130 to 120 to be compatible with MacOS
1.31
2022-10-22 11:44:59 +02:00
LionZXY 4a58155193 Update cosmic.frag 2022-10-16 23:11:37 +04:00
Martin Robertz cc2cccf535 Merge pull request #23 from Kiwi233/master
Update zh_CN.lang
1.30
2022-09-24 12:41:59 +02:00
[Kiwi233] 424967e27b Update zh_CN.lang 2022-09-24 11:04:37 +08:00
Martin Robertz 629d20b200 Merge pull request #22 from GTNewHorizons/fix/item-renderer
Properly render item halo
1.29
2022-08-20 14:49:33 +02:00
Vladislav Laetansky c4bf6c9817 Properly render item halo 2022-08-20 14:07:01 +03:00
Connor-Colenso cbb82e4734 Merge pull request #21 from POPlol333/master
tweaked infinity egg recipe to fit further use
1.28
2022-08-09 23:01:23 +01:00
POPlol333 2e1b11f03a he boinked me 2022-08-09 15:08:24 +02:00
POPlol333 639028f9f7 fixed modid cuz i'm dumb 2022-08-09 15:02:09 +02:00
POPlol333 eb851f4df4 Logs are important 2022-08-09 15:01:08 +02:00
POPlol333 ad2b8b3c16 fixing boubou being mad at me 2022-08-09 14:56:21 +02:00
POPlol333 d55c5676f9 tweaked infinity egg recipe to fit further use 2022-08-09 13:57:30 +02:00
Jason Mitchell 5d2d9ea414 [ci skip] Migrate github actions to GTNH-Actions-Workflows 2022-07-16 10:38:46 -07:00
Martin Robertz 081ea1db0e Merge pull request #20 from GTNewHorizons/neutronium-block
Rename Neutronium Block
1.27
2022-06-14 17:11:05 +02:00
miozune 0edb55da7e Rename Neutronium Block 2022-06-14 22:56:21 +09:00
Martin Robertz daa32274ff Merge pull request #19 from GTNewHorizons/alignment
Fix alignment
1.26
2022-05-25 17:12:30 +02:00
miozune 14db45ad0b Fix alignment 2022-05-18 16:29:00 +09:00
Martin Robertz 1a10110033 Merge pull request #18 from Kiwi233/master
Update zh_CN.lang
2022-04-15 10:46:30 +02:00
[Kiwi233] 1580a4339d Update zh_CN.lang 2022-04-14 09:29:58 +08:00
Martin Robertz 950bbbff71 Merge pull request #17 from kubasz/master
Add missing markDirty() calls on inventory slot changes
2022-04-05 07:09:22 +02:00
Jakub Szewczyk 4e0fd22ce7 Add missing markDirty() calls on inventory slot changes 2022-04-04 19:57:01 +01:00
Martin Robertz e6959ea331 Merge pull request #16 from GTNewHorizons/fixrelease
fix release
1.25
2022-02-27 23:01:36 +01:00
bombcar 241bcabf1e fix release 2022-02-27 15:55:27 -06:00
Martin Robertz 9b12560880 Merge pull request #15 from GTNewHorizons/nbt-nei
Fix irrelevant Botania flowers show up in NEI
2022-02-25 12:18:01 +01:00
miozune 67635e7555 Fix irrelevant Botania flowers show up in NEI 2022-02-19 12:40:16 +09:00
Martin Robertz 3eba0fb917 Merge pull request #14 from GTNewHorizons/upstream-stuff
Upstream Stuff
1.24
2022-02-09 21:11:12 +01:00
bombcar 6c46de8a45 comma 2022-02-09 08:13:34 -06:00
bombcar da65d9c08d versioning 2022-02-09 08:12:57 -06:00
bombcar 04551c85fc buildscript and deps 2022-02-09 08:11:14 -06:00
glowredman 572138e0f0 Merge branch 'upstream-stuff' of https://github.com/GTNewHorizons/Avaritia into upstream-stuff 1.2.5 2022-02-07 19:16:24 +01:00
glowredman 23a254682b Fix oversights 2022-02-07 19:16:14 +01:00
glowredman 6f61f475ec Merge branch 'master' into upstream-stuff 2022-02-07 17:05:10 +01:00
glowredman 119a857635 Remove MorvInABox 2022-02-07 16:40:11 +01:00
glowredman 690663fd57 Missing removals 2022-02-07 16:38:12 +01:00
glowredman 3a18612b05 Remove duplicate texture 2022-02-07 16:35:04 +01:00
glowredman f732faa113 Adapt to GTNH
- remove Alfheim (unfinished)
- remove Dire Autocrafting Table (unfinished/broken)
2022-02-07 16:32:09 +01:00
Martin Robertz eadac98bd8 Merge pull request #13 from GTNewHorizons/fixderps
MIT
1.23 1.2.4
2022-02-07 06:48:18 +01:00
bombcar 1744428a2e update dependencies 2022-02-06 19:04:50 -06:00
Martin Robertz 57dc2d4646 Merge pull request #12 from Kiwi233/master
Update zh_CN.lang
2022-02-06 19:30:14 +01:00
[Kiwi233] fcad80db7b Update zh_CN.lang 2022-02-06 22:08:33 +08:00
glowredmanandRCXcrafter 7016e25aa9 improve some textures
https: //github.com/SpitefulFox/Avaritia/commit/4b8dc7cb5e63f88e01ac164824b332e41559a5ba
Co-Authored-By: RCXcrafter <[email protected]>
2022-02-05 02:19:32 +01:00
glowredmanandSpitefulFox 37a2f9df55 Ooooops
https: //github.com/SpitefulFox/Avaritia/commit/215f63537beb33631a4a4b473b8a142b3b0faf21
Co-Authored-By: SpitefulFox <[email protected]>
2022-02-05 02:08:56 +01:00
glowredmanandSpitefulFox d891ab137d Lasers and Gears
https: //github.com/SpitefulFox/Avaritia/commit/90f155b33ca1845c987b8cdaf3bfe0fd502e93cd
Co-Authored-By: SpitefulFox <[email protected]>
2022-02-05 01:40:34 +01:00