Commit Graph
231 Commits
Author SHA1 Message Date
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
glowredmanandSpitefulFox 1018729319 The Beginning... of a mess
https: //github.com/SpitefulFox/Avaritia/commit/b8922319104199b5e15e2b073bfbc0ea5c775fab
Co-Authored-By: SpitefulFox <[email protected]>
2022-02-05 01:35:56 +01:00
glowredmanandT Brieger eac6314124 Nothing To See Here
https: //github.com/SpitefulFox/Avaritia/commit/4631db28b9e61436ba32d906f8004fa75da02c34
Co-Authored-By: T Brieger <[email protected]>
2022-02-05 01:26:00 +01:00
glowredmanandT Brieger e367abf5a6 Add files via upload
Co-Authored-By: T Brieger <[email protected]>
2022-02-05 01:22:27 +01:00
glowredmanandSpitefulFox 94f43164cc Automatic Hell
https: //github.com/SpitefulFox/Avaritia/commit/a4033ac57105fb673ef688aa71a23e015589e23b
Co-Authored-By: SpitefulFox <[email protected]>
2022-02-05 01:20:23 +01:00
glowredmanandSpitefulFox 7cefe28ba1 Just Put Some Gears On It
https: //github.com/SpitefulFox/Avaritia/commit/108ec86714fa6d2f1b1e230f6ecf5b332252e900
Co-Authored-By: SpitefulFox <[email protected]>
2022-02-05 01:14:11 +01:00
glowredmanandSpitefulFox 460b62f32e UNLIMITED BALANCE!!!!
https: //github.com/SpitefulFox/Avaritia/commit/ed0741f20c2606eaba3835f713ee5780d7a8cd89
Co-Authored-By: SpitefulFox <[email protected]>
2022-02-05 01:09:35 +01:00
glowredmanandSpitefulFox 1dda8774c1 Better Than Enderium
Fixes https://github.com/SpitefulFox/Avaritia/issues/78
Fixes https://github.com/SpitefulFox/Avaritia/issues/80

https: //github.com/SpitefulFox/Avaritia/commit/b16e14331f872d6504f2b213196b8458cd873bad
Co-Authored-By: SpitefulFox <[email protected]>
2022-02-05 00:57:58 +01:00
glowredmanandSpitefulFox c3ee98c870 Eggselent Compatibility
Fixes https://github.com/SpitefulFox/Avaritia/issues/79

https: //github.com/SpitefulFox/Avaritia/commit/f96d990c38005b2a616118852f6db68156fdb1a8
Co-Authored-By: SpitefulFox <[email protected]>
2022-02-05 00:55:45 +01:00
glowredmanandSpitefulFox 76929e9c8f Planar Conjunction
https: //github.com/SpitefulFox/Avaritia/commit/ff6ab98288aba77c2c7b362c7f1480c02c4623bc
Co-Authored-By: SpitefulFox <[email protected]>
2022-02-05 00:53:42 +01:00
glowredmanandSpitefulFox 30de3c00a1 Don't Gotta Go Fast
Fixes https://github.com/SpitefulFox/Avaritia/issues/106

https: //github.com/SpitefulFox/Avaritia/commit/60d5c101b1d99cbff4d11522581d6e247b3b1a66
Co-Authored-By: SpitefulFox <[email protected]>
2022-02-05 00:30:53 +01:00
glowredmanandSpitefulFox 95c7b2bd39 Recipes Check NBT
Fixes https://github.com/SpitefulFox/Avaritia/issues/99

https: //github.com/SpitefulFox/Avaritia/commit/6c6503bc23de22d76694763e1b21e38d217f56c3
Co-Authored-By: SpitefulFox <[email protected]>
2022-02-05 00:27:48 +01:00
glowredmanandSpitefulFox d6138b3ce9 Destruction Rains From The Heavens
Fixes https://github.com/SpitefulFox/Avaritia/issues/113

https: //github.com/SpitefulFox/Avaritia/commit/238db2d5bbf22245b736b69f42c27e970c130084
Co-Authored-By: SpitefulFox <[email protected]>
2022-02-05 00:20:40 +01:00
glowredmanandSpitefulFox f1e0389f79 Allow Compressor Recipe Removal
Fixes issue https://github.com/SpitefulFox/Avaritia/issues/116

https: //github.com/SpitefulFox/Avaritia/commit/d5bf10c460c06355ae69647df86beb99261eb44f
Co-Authored-By: SpitefulFox <[email protected]>
2022-02-05 00:18:42 +01:00
glowredman f1fccec08b Update buildscript 2022-02-05 00:16:37 +01:00
Martin Robertz afae929ca6 fix buildscript
remove old build properties file
1.2.3
2022-01-23 21:44:35 +01:00
Jason Mitchell 1c00dbd244 update to explicit dependencies 1.2.2 1.22 2022-01-18 09:03:33 -08:00
Jason Mitchell ff952fb62c maven publish buildscript update 2022-01-18 09:02:00 -08:00
Martin Robertz 493689a681 Merge pull request #10 from Zereff06/Update-ru-lang
Update ru lang
2022-01-16 16:21:55 +01:00
Zereff06 be732feb82 Update ru_RU.lang
Маленькая кучка нейтрония -> Маленькая кучка нейтронов
2022-01-16 16:40:28 +02:00
Zereff06 17e9442833 Update ru_RU.lang 2022-01-16 15:06:32 +02:00
Zereff06 13698e3b86 Update ru_RU.lang 2022-01-15 00:30:23 +02:00
Zereff06 490f27a8bb Create ru_RU.lang 2022-01-14 22:32:23 +02:00
Martin Robertz eabe65239c Merge pull request #9 from GTNewHorizons/GTNH-Colen-patch-1
Update neutronium name
1.21
2022-01-09 14:06:33 +01:00
GTNH-Colen c63d3382b1 Update neutronium name
This puts it in line with the ore dictionary name and the GT dust that is currently in use. Makes logical sense imo as currently we have two ingots named neutronium as well as inconsistency between the dust and ingot.
2022-01-09 08:19:55 +00:00
Martin Robertz b35d11e682 Merge pull request #8 from GTNewHorizons/unified-build-script
Unified build script
1.20
2021-12-20 00:07:58 +01:00
Johann Bernhardt 5973ec29ba Resolved todos in dependencies 2021-12-19 22:11:33 +01:00
Johann Bernhardt 79cffbb8ae Migrate to unified build script 2021-12-18 14:35:19 +01:00
Johann Bernhardt 43a0fc09a7 Removed copied dependencies 2021-12-18 14:34:29 +01:00
DreamMasterXXL 85c175362a add(Avaritia)Changelog 2021-06-27 23:00:33 +02:00
DreamMasterXXL cbc5902aae bump version
update gitignore
1.19
2021-05-16 13:11:25 +02:00
Martin Robertz a7829df3a1 Merge pull request #7 from FPSP-Modpack/master
Fix Forestry wrongly being fetched from CurseMaven
2021-04-26 21:32:11 +02:00
glowredman 7edd9e6598 Update Jenkins link in README 2021-04-26 21:00:12 +02:00
glowredman 5e10ffa287 Fix™ Foretry being fetched from CurseMaven 2021-04-26 20:59:57 +02:00
Martin Robertz 83c8a6dcdc Merge pull request #6 from FPSP-Modpack/master
Fix Buildscript
2021-04-26 20:44:53 +02:00
glowredman 0f5137af84 Update buildscript
- Updated Gradle to 5.6.4
- Introduced GT Forge mirror
- updated dependencies
2021-04-26 20:39:48 +02:00