diff --git a/build.gradle.kts b/build.gradle.kts index 7b68304..cea8f22 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -87,6 +87,7 @@ subprojects { maven("https://maven.parchmentmc.org") // Parchment mappings maven("https://maven.quiltmc.org/repository/release") // Quilt Mappings maven("https://maven.ithundxr.dev/releases") // Steam 'n' Rails Releases + maven("https://maven.ithundxr.dev/snapshots") // Steam 'n' Rails Snapshots maven("https://maven.tterrag.com/") { // Flywheel content { // need to be specific here due to version overlaps diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 8dcbc85..c32d8df 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -65,7 +65,8 @@ dependencies { modCompileOnly("net.fabricmc.fabric-api:fabric-api:${"fabric_api_version"()}") // Steam 'n' Rails - modCompileOnly("com.railwayteam.railways:Steam_Rails-common-${"minecraft_version"()}:${"snr_version"()}+common-mc${"minecraft_version"()}") { isTransitive = false } + val buildNumber = if ("snr_build_number"() != "null") "-build." + "snr_build_number"() else "" + modCompileOnly("com.railwayteam.railways:Steam_Rails-common-${"minecraft_version"()}:${"snr_version"()}+common-mc${"minecraft_version"() + buildNumber}") { isTransitive = false } // Carry On modCompileOnly("tschipp.carryon:carryon-fabric-${"minecraft_version"()}:${"carryon_fabric_version"()}") diff --git a/common/src/generated/resources/.cache/630af4bded938901e0e1fd57c58a2ac245292828 b/common/src/generated/resources/.cache/630af4bded938901e0e1fd57c58a2ac245292828 index 31c5243..2d482eb 100644 --- a/common/src/generated/resources/.cache/630af4bded938901e0e1fd57c58a2ac245292828 +++ b/common/src/generated/resources/.cache/630af4bded938901e0e1fd57c58a2ac245292828 @@ -1,5 +1,5 @@ -// 1.20.1 2024-08-08T14:22:14.213110993 Create: Numismatics/Numismatics' Advancements -4ab84595dc44460d6d89ff3608940dd8694b93d6 data/numismatics/advancements/is_this_legal.json -645c92e6e449889ed4cf617432fd6fa87ffe355b data/numismatics/advancements/questionable_investment.json +// 1.20.1 2024-09-02T18:45:23.011620925 Create: Numismatics/Numismatics' Advancements 8f32fb49ef81058e2e660fac983dbef2f554db38 data/numismatics/advancements/root.json +645c92e6e449889ed4cf617432fd6fa87ffe355b data/numismatics/advancements/questionable_investment.json 894790d980b33b5cc24a21937c7db72bf0af1c5a data/numismatics/advancements/money_laundering.json +4ab84595dc44460d6d89ff3608940dd8694b93d6 data/numismatics/advancements/is_this_legal.json diff --git a/common/src/generated/resources/.cache/6ba62358bf8e130d42215f5f9edbedd611809677 b/common/src/generated/resources/.cache/6ba62358bf8e130d42215f5f9edbedd611809677 index 460ba8c..f669443 100644 --- a/common/src/generated/resources/.cache/6ba62358bf8e130d42215f5f9edbedd611809677 +++ b/common/src/generated/resources/.cache/6ba62358bf8e130d42215f5f9edbedd611809677 @@ -1,109 +1,109 @@ -// 1.20.1 2024-08-08T14:22:14.210008775 Create: Numismatics/Numismatics Standard Recipes -0e1680b878cfa51c04809504b3542cb6312027a1 data/numismatics/recipes/crafting/gray_id_card.json -61954216f844eecdbee266da7e517a983993d2f8 data/numismatics/advancements/recipes/misc/crafting/brown_card.json -2c732f9c3bc02a29a4d86a0552f4dbbae986a34a data/numismatics/recipes/crafting/blue_authorized_card.json -e91feedee6f602a6c19d39fd6a3c10f0fd17208f data/numismatics/recipes/crafting/brown_authorized_card.json -350ce3eaa44f59f9cdf7810bdc101cb010c9dcc1 data/numismatics/advancements/recipes/misc/crafting/magenta_authorized_card.json -a87641c131fe00d2ef54caed44ec741ef0dd6dee data/numismatics/recipes/crafting/magenta_card.json -ff7d6b3f21b735e3378add718c16e3c0c643f5f3 data/numismatics/recipes/crafting/pink_id_card.json -244012381f0600ab5116066948c81398dcdbd3d4 data/numismatics/advancements/recipes/misc/crafting/bank_terminal.json -0000b8a2cd58843eb7cf2c0b4b7b71a07baf3652 data/numismatics/advancements/recipes/misc/crafting/magenta_card.json -f2d158116054b5f0a28e2df07be3e11e5e5e74f7 data/numismatics/advancements/recipes/misc/crafting/white_id_card.json -839f1ed3f0f662ca63614bdb48f70472deb6cc8e data/numismatics/recipes/crafting/gray_authorized_card.json -4f1f98fe5f1e8d59cdd6b7bc8213b439edce4634 data/numismatics/recipes/crafting/yellow_authorized_card.json -adb81866fed19b22faf8aee7dff52d1294326208 data/numismatics/recipes/crafting/light_blue_id_card.json -9dc53a455bef89e74178737998ff8bb699974af2 data/numismatics/advancements/recipes/misc/crafting/pink_id_card.json -c8f1d58fc2017de5d0888b13ebcbf7802dc7678c data/numismatics/advancements/recipes/misc/crafting/light_blue_authorized_card.json -a9acb103fdf3c06e561b7252083fae594074ba40 data/numismatics/advancements/recipes/misc/crafting/white_card.json -29ba720cf8ae338eec2edbd997fcb3f6a8de7cd1 data/numismatics/advancements/recipes/misc/crafting/vendor.json -6c3d017d9438e74552384a2b391ad5b6c5bb74e0 data/numismatics/recipes/crafting/magenta_authorized_card.json -67ac012247db080a6231312a1de981724cd3f82d data/numismatics/recipes/crafting/bank_terminal.json -da540ae92c84519149c1b37ad49290814f507a8a data/numismatics/advancements/recipes/misc/crafting/white_authorized_card.json -12014c6c5ac12fdddc45d61bdb3841e2f930125d data/numismatics/recipes/crafting/red_card.json -858305a3537cdcb5bb19b883e688ddb876f0473c data/numismatics/recipes/crafting/brown_id_card.json -35d3c0460a2ba41603bea8e1453b26d662a1f2d5 data/numismatics/advancements/recipes/misc/crafting/yellow_authorized_card.json -ce32a3a7c2a5564e84b30bb1b71007ca4adc985d data/numismatics/recipes/crafting/lime_authorized_card.json -501f27ee03faeb675a05b63b0c8058f1473f02d5 data/numismatics/advancements/recipes/misc/crafting/purple_id_card.json -8d863132d01d516db98d228e9038425923b7354d data/numismatics/recipes/crafting/black_card.json -78af0a7f17e04133eae7172df3255aaa34034537 data/numismatics/advancements/recipes/misc/crafting/red_id_card.json +// 1.20.1 2024-09-02T18:45:23.010340154 Create: Numismatics/Numismatics Standard Recipes e16d9a5134c226db94bb389c44e55a8b393ca6c4 data/numismatics/recipes/crafting/brass_depositor.json -86ccf10cd1549f633f99674b002c543bd46aefd0 data/numismatics/recipes/crafting/yellow_card.json -1d0c5ff8b555ba922b0699a93dceb4cb9d49c4f9 data/numismatics/advancements/recipes/misc/crafting/lime_card.json -b8f2498c1400a0f96c494cdbd8824b19b8bca742 data/numismatics/advancements/recipes/misc/crafting/salepoint.json -3cfbeee014050f945e5fa2299dbbcfbf120bf29a data/numismatics/recipes/crafting/red_authorized_card.json -6d90141ba018612413149776136ccb11b26add7c data/numismatics/advancements/recipes/misc/crafting/light_gray_authorized_card.json -8ae4c3c323f9b8ea0261f5e0d1fb9f7c15e9cf6b data/numismatics/recipes/crafting/light_gray_card.json -d8007d8586a071ea28f40b14ec36a37771b4c173 data/numismatics/advancements/recipes/misc/crafting/brown_authorized_card.json +f2d158116054b5f0a28e2df07be3e11e5e5e74f7 data/numismatics/advancements/recipes/misc/crafting/white_id_card.json 8c7b922c9569a4c7b2cedbe957e59427975f6abf data/numismatics/advancements/recipes/misc/crafting/green_card.json -151c31385fcbf7283f380e25ee2c8fdacd6d5103 data/numismatics/recipes/crafting/orange_id_card.json -dca08f89788e5995829190522f0b65518ba4662a data/numismatics/recipes/crafting/orange_card.json -545cd37f988dd1904ce5929f9ca44bf782b2b8d7 data/numismatics/recipes/crafting/pink_authorized_card.json -001236743f26b5c2df8d050b4182562e84a69779 data/numismatics/advancements/recipes/misc/crafting/magenta_id_card.json -7d42bcd127bc77bc6d06d07b84a77622522d1e98 data/numismatics/recipes/crafting/light_gray_authorized_card.json -dcb522b8700b7e058e043573f31c4fc67551eb86 data/numismatics/recipes/crafting/andesite_depositor.json -6bd7bdeefcc3019e6a60fe097ae155779d34a412 data/numismatics/advancements/recipes/misc/crafting/light_gray_card.json -06323df9c938f4a44bb98ab5236c8d28af1daff8 data/numismatics/advancements/recipes/misc/crafting/green_id_card.json -0ec4f8d7fd3ef45fd3a20d995b91b327767ee122 data/numismatics/recipes/crafting/light_blue_authorized_card.json -c310626562a698c5598e5b95cc397dcf5c4c803d data/numismatics/advancements/recipes/misc/crafting/gray_card.json -4dc98a1d5028d6a9df2d6ae8987744e409a97029 data/numismatics/advancements/recipes/misc/crafting/orange_card.json +4f6314ea11c7524569cf9ea711e7d5dc90abee37 data/numismatics/advancements/recipes/misc/crafting/purple_authorized_card.json 78c03ce1632f59f8203d7c5839e7c093b0a56ff6 data/numismatics/recipes/crafting/light_blue_card.json -a2966bf8eb0aa54b64e4c77d1522bd6163e03a1d data/numismatics/advancements/recipes/misc/crafting/orange_id_card.json -1dfe24cac3a8509fb4681d46998cf7e1b39e8e2c data/numismatics/advancements/recipes/misc/crafting/black_authorized_card.json -5cc24c0941d059f3beba740a0b5f80a4537781a3 data/numismatics/advancements/recipes/misc/crafting/blue_card.json -e4e1818714e49b1dd45c596ece3ca28042381906 data/numismatics/advancements/recipes/misc/crafting/red_card.json -8ebbf07d426b182d8833afb9ee3f8e3a2feb850f data/numismatics/recipes/crafting/blue_id_card.json -b33377448ad6812c10b1405051359e58172299e9 data/numismatics/advancements/recipes/misc/crafting/brown_id_card.json -2c923f377d0945abea77297db5f4bf08bafb824e data/numismatics/advancements/recipes/misc/crafting/cyan_card.json -606c6054ab3ab165654c4de002c7e93d3f7fab3b data/numismatics/recipes/crafting/green_card.json -50dae4e6bc13a1e6f914fb8de99b06e807641d2a data/numismatics/advancements/recipes/misc/crafting/pink_card.json +9dc53a455bef89e74178737998ff8bb699974af2 data/numismatics/advancements/recipes/misc/crafting/pink_id_card.json +0ec4f8d7fd3ef45fd3a20d995b91b327767ee122 data/numismatics/recipes/crafting/light_blue_authorized_card.json +b359f00206e8522f61fa06cc6bda43142f180e30 data/numismatics/recipes/crafting/lime_card.json +545cd37f988dd1904ce5929f9ca44bf782b2b8d7 data/numismatics/recipes/crafting/pink_authorized_card.json +360f03b664bac1cf6fde98e1ec77ca6e93933c4a data/numismatics/advancements/recipes/misc/crafting/banking_guide.json 574d01d5616971ae92d1087f9a9d90bb93c3419e data/numismatics/recipes/crafting/black_id_card.json +4f1f98fe5f1e8d59cdd6b7bc8213b439edce4634 data/numismatics/recipes/crafting/yellow_authorized_card.json +da540ae92c84519149c1b37ad49290814f507a8a data/numismatics/advancements/recipes/misc/crafting/white_authorized_card.json 11be645cfbf1ee8721ffceb2b47d30e2923e9323 data/numismatics/advancements/recipes/misc/crafting/andesite_depositor.json -4f07744fcb39c07782b21f31584dbd041f7d172e data/numismatics/advancements/recipes/misc/crafting/light_blue_card.json -ea20b56eaa5e6c8af48b7b8c3c33cd15c0107bc1 data/numismatics/advancements/recipes/misc/crafting/gray_authorized_card.json -d7a7609aa109440f0f47b8ba7c598d9f7a667734 data/numismatics/advancements/recipes/misc/crafting/blue_id_card.json -4ef1874d44a47c50706505c00f866b9ecb6d860d data/numismatics/recipes/crafting/purple_authorized_card.json -dccd117562bb9bf28890aa0aa53273b4587504ee data/numismatics/recipes/crafting/white_card.json -cee2975b897e1c1216e301ad69dea85258902546 data/numismatics/advancements/recipes/misc/crafting/black_id_card.json +ba04c62863e2c847ad7ac240e282c3f6ecd85d62 data/numismatics/recipes/crafting/banking_guide.json +2c732f9c3bc02a29a4d86a0552f4dbbae986a34a data/numismatics/recipes/crafting/blue_authorized_card.json +0000b8a2cd58843eb7cf2c0b4b7b71a07baf3652 data/numismatics/advancements/recipes/misc/crafting/magenta_card.json +af8adf907389ccfa18bfa035d40108f9c5755ddd data/numismatics/recipes/crafting/white_id_card.json 6ed249679ea9168906e4e00a7c6f85f432f9cd16 data/numismatics/advancements/recipes/misc/crafting/orange_authorized_card.json -20434910bb6e5fa2e8350f52b30c728b091a85d3 data/numismatics/recipes/crafting/brown_card.json -24bb0a27737622bbc1dfce601b0030372f0b6bcf data/numismatics/recipes/crafting/black_authorized_card.json +61954216f844eecdbee266da7e517a983993d2f8 data/numismatics/advancements/recipes/misc/crafting/brown_card.json +753e91e51246f8ac75ac67fbd3b912e663ba8ee8 data/numismatics/advancements/recipes/misc/crafting/purple_card.json +c5c615ba24d8d06bd315053984225ae34124761c data/numismatics/recipes/crafting/magenta_id_card.json +caff153f8b3751f805227c8fc20a145dae8406b6 data/numismatics/advancements/recipes/misc/crafting/light_gray_id_card.json 53a3678011a51e8d1c6419345c88d2ffa07e6d44 data/numismatics/recipes/crafting/cyan_id_card.json -ff911cab5fbdab250fe0cf4822e6fbd4e5c99f2a data/numismatics/advancements/recipes/misc/crafting/blue_authorized_card.json -7a4b88c35cad4209e13d11e913617fdcc525542d data/numismatics/advancements/recipes/misc/crafting/red_authorized_card.json +2c923f377d0945abea77297db5f4bf08bafb824e data/numismatics/advancements/recipes/misc/crafting/cyan_card.json +3bdee0ea570562c973144de2f27938e8018ef9b4 data/numismatics/recipes/crafting/pink_card.json +d518f47ea8446f1ebd592d7d74d96dec66755651 data/numismatics/recipes/crafting/gray_card.json +c8f1d58fc2017de5d0888b13ebcbf7802dc7678c data/numismatics/advancements/recipes/misc/crafting/light_blue_authorized_card.json +7d42bcd127bc77bc6d06d07b84a77622522d1e98 data/numismatics/recipes/crafting/light_gray_authorized_card.json +244012381f0600ab5116066948c81398dcdbd3d4 data/numismatics/advancements/recipes/misc/crafting/bank_terminal.json +adb81866fed19b22faf8aee7dff52d1294326208 data/numismatics/recipes/crafting/light_blue_id_card.json d3d26ab5f434385090c7f3e5ba10dd874a336bdd data/numismatics/recipes/crafting/green_id_card.json -13b984e17c52cc24968f4fd1ba67b915243a4b27 data/numismatics/recipes/crafting/vendor.json -cb356731ac23d0daa7a9ed36a0abdda104235b64 data/numismatics/advancements/recipes/misc/crafting/pink_authorized_card.json -5c882ba48afb491eac809ad5fef36c5d419afd1f data/numismatics/recipes/crafting/purple_card.json -156bac80f52563211c3e8625f308acc229640000 data/numismatics/recipes/crafting/blue_card.json +4ef1874d44a47c50706505c00f866b9ecb6d860d data/numismatics/recipes/crafting/purple_authorized_card.json +4dc98a1d5028d6a9df2d6ae8987744e409a97029 data/numismatics/advancements/recipes/misc/crafting/orange_card.json +d8007d8586a071ea28f40b14ec36a37771b4c173 data/numismatics/advancements/recipes/misc/crafting/brown_authorized_card.json +8d863132d01d516db98d228e9038425923b7354d data/numismatics/recipes/crafting/black_card.json +cded917dee4ac35f9499992f6e0767a8638a5113 data/numismatics/recipes/crafting/orange_authorized_card.json +1dfe24cac3a8509fb4681d46998cf7e1b39e8e2c data/numismatics/advancements/recipes/misc/crafting/black_authorized_card.json +86ccf10cd1549f633f99674b002c543bd46aefd0 data/numismatics/recipes/crafting/yellow_card.json +78af0a7f17e04133eae7172df3255aaa34034537 data/numismatics/advancements/recipes/misc/crafting/red_id_card.json +67ac012247db080a6231312a1de981724cd3f82d data/numismatics/recipes/crafting/bank_terminal.json +b8f2498c1400a0f96c494cdbd8824b19b8bca742 data/numismatics/advancements/recipes/misc/crafting/salepoint.json +a9acb103fdf3c06e561b7252083fae594074ba40 data/numismatics/advancements/recipes/misc/crafting/white_card.json +136bf9f53ce695973fba2719ce75872a05dc3bf2 data/numismatics/recipes/crafting/cyan_authorized_card.json a2d0106c95fb00a808af0ebb2a5c0d83a3a913a4 data/numismatics/advancements/recipes/misc/crafting/light_blue_id_card.json -3bdee0ea570562c973144de2f27938e8018ef9b4 data/numismatics/recipes/crafting/pink_card.json -011bfd082068cb75738cb9ea54e5f76147c0436f data/numismatics/advancements/recipes/misc/crafting/black_card.json +8ebbf07d426b182d8833afb9ee3f8e3a2feb850f data/numismatics/recipes/crafting/blue_id_card.json +6bd7bdeefcc3019e6a60fe097ae155779d34a412 data/numismatics/advancements/recipes/misc/crafting/light_gray_card.json +156bac80f52563211c3e8625f308acc229640000 data/numismatics/recipes/crafting/blue_card.json +cee2975b897e1c1216e301ad69dea85258902546 data/numismatics/advancements/recipes/misc/crafting/black_id_card.json +35d3c0460a2ba41603bea8e1453b26d662a1f2d5 data/numismatics/advancements/recipes/misc/crafting/yellow_authorized_card.json +501f27ee03faeb675a05b63b0c8058f1473f02d5 data/numismatics/advancements/recipes/misc/crafting/purple_id_card.json +5d68fafc0fe40d0cbbc02c778641edb7118026de data/numismatics/advancements/recipes/misc/crafting/lime_id_card.json +12014c6c5ac12fdddc45d61bdb3841e2f930125d data/numismatics/recipes/crafting/red_card.json +001236743f26b5c2df8d050b4182562e84a69779 data/numismatics/advancements/recipes/misc/crafting/magenta_id_card.json +b33377448ad6812c10b1405051359e58172299e9 data/numismatics/advancements/recipes/misc/crafting/brown_id_card.json +350ce3eaa44f59f9cdf7810bdc101cb010c9dcc1 data/numismatics/advancements/recipes/misc/crafting/magenta_authorized_card.json +4f07744fcb39c07782b21f31584dbd041f7d172e data/numismatics/advancements/recipes/misc/crafting/light_blue_card.json +fca73628e0fc837c1e8f06f0f63d4b8983651d83 data/numismatics/advancements/recipes/misc/crafting/yellow_id_card.json +a87641c131fe00d2ef54caed44ec741ef0dd6dee data/numismatics/recipes/crafting/magenta_card.json +073f5238842a1e3bb7624479e6e061e25a6d551b data/numismatics/advancements/recipes/misc/crafting/gray_id_card.json 5bf1eddd9bf4c4d910728c812c392f88ce427012 data/numismatics/recipes/crafting/red_id_card.json -b359f00206e8522f61fa06cc6bda43142f180e30 data/numismatics/recipes/crafting/lime_card.json -386f7cbc350f5448e31c71053309e48a71df15f1 data/numismatics/recipes/crafting/green_authorized_card.json +839f1ed3f0f662ca63614bdb48f70472deb6cc8e data/numismatics/recipes/crafting/gray_authorized_card.json +a30c11ea13bb0d445ed47725ed4995dd291bc700 data/numismatics/advancements/recipes/misc/crafting/cyan_id_card.json +06323df9c938f4a44bb98ab5236c8d28af1daff8 data/numismatics/advancements/recipes/misc/crafting/green_id_card.json +151c31385fcbf7283f380e25ee2c8fdacd6d5103 data/numismatics/recipes/crafting/orange_id_card.json +858305a3537cdcb5bb19b883e688ddb876f0473c data/numismatics/recipes/crafting/brown_id_card.json +8fd00cd399cf9329a63b6264918372ebf90ad79b data/numismatics/recipes/crafting/light_gray_id_card.json +e4e1818714e49b1dd45c596ece3ca28042381906 data/numismatics/advancements/recipes/misc/crafting/red_card.json +dcb522b8700b7e058e043573f31c4fc67551eb86 data/numismatics/recipes/crafting/andesite_depositor.json 8ec31340673a11ae32cd58f441b30432aa963a4c data/numismatics/recipes/crafting/white_authorized_card.json +39047da0807eb1054a179e6ecf63e85676a9f0a0 data/numismatics/advancements/recipes/misc/crafting/brass_depositor.json +7a4b88c35cad4209e13d11e913617fdcc525542d data/numismatics/advancements/recipes/misc/crafting/red_authorized_card.json +29ba720cf8ae338eec2edbd997fcb3f6a8de7cd1 data/numismatics/advancements/recipes/misc/crafting/vendor.json +a2966bf8eb0aa54b64e4c77d1522bd6163e03a1d data/numismatics/advancements/recipes/misc/crafting/orange_id_card.json +0e1680b878cfa51c04809504b3542cb6312027a1 data/numismatics/recipes/crafting/gray_id_card.json +5c882ba48afb491eac809ad5fef36c5d419afd1f data/numismatics/recipes/crafting/purple_card.json +ea20b56eaa5e6c8af48b7b8c3c33cd15c0107bc1 data/numismatics/advancements/recipes/misc/crafting/gray_authorized_card.json 8ede57d6fa0fb30cc5edf0eb842844071f8c2026 data/numismatics/advancements/recipes/misc/crafting/green_authorized_card.json -cded917dee4ac35f9499992f6e0767a8638a5113 data/numismatics/recipes/crafting/orange_authorized_card.json -fca73628e0fc837c1e8f06f0f63d4b8983651d83 data/numismatics/advancements/recipes/misc/crafting/yellow_id_card.json -3f5ad3c091647c23017b749dc54becf6042562ab data/numismatics/recipes/crafting/salepoint.json -0d9dc5041578195c578860f7af550cae670b1016 data/numismatics/advancements/recipes/misc/crafting/cyan_authorized_card.json +8ae4c3c323f9b8ea0261f5e0d1fb9f7c15e9cf6b data/numismatics/recipes/crafting/light_gray_card.json +7ced89d9f2a4266155fc5e8b650ffbecac27fd6e data/numismatics/advancements/recipes/misc/crafting/lime_authorized_card.json +f160e3f01433b3815e8734e0ae0ed7eadc19e53b data/numismatics/recipes/crafting/cyan_card.json +ff7d6b3f21b735e3378add718c16e3c0c643f5f3 data/numismatics/recipes/crafting/pink_id_card.json +1d0c5ff8b555ba922b0699a93dceb4cb9d49c4f9 data/numismatics/advancements/recipes/misc/crafting/lime_card.json +cb356731ac23d0daa7a9ed36a0abdda104235b64 data/numismatics/advancements/recipes/misc/crafting/pink_authorized_card.json d8a8bdef01cc07e8902c89c247da5b53c6b3cda8 data/numismatics/advancements/recipes/misc/crafting/yellow_card.json -ba04c62863e2c847ad7ac240e282c3f6ecd85d62 data/numismatics/recipes/crafting/banking_guide.json -136bf9f53ce695973fba2719ce75872a05dc3bf2 data/numismatics/recipes/crafting/cyan_authorized_card.json -5d68fafc0fe40d0cbbc02c778641edb7118026de data/numismatics/advancements/recipes/misc/crafting/lime_id_card.json -af8adf907389ccfa18bfa035d40108f9c5755ddd data/numismatics/recipes/crafting/white_id_card.json -c5c615ba24d8d06bd315053984225ae34124761c data/numismatics/recipes/crafting/magenta_id_card.json +5cc24c0941d059f3beba740a0b5f80a4537781a3 data/numismatics/advancements/recipes/misc/crafting/blue_card.json +24bb0a27737622bbc1dfce601b0030372f0b6bcf data/numismatics/recipes/crafting/black_authorized_card.json +3f5ad3c091647c23017b749dc54becf6042562ab data/numismatics/recipes/crafting/salepoint.json +50dae4e6bc13a1e6f914fb8de99b06e807641d2a data/numismatics/advancements/recipes/misc/crafting/pink_card.json +20434910bb6e5fa2e8350f52b30c728b091a85d3 data/numismatics/recipes/crafting/brown_card.json +c310626562a698c5598e5b95cc397dcf5c4c803d data/numismatics/advancements/recipes/misc/crafting/gray_card.json +6d90141ba018612413149776136ccb11b26add7c data/numismatics/advancements/recipes/misc/crafting/light_gray_authorized_card.json +dccd117562bb9bf28890aa0aa53273b4587504ee data/numismatics/recipes/crafting/white_card.json +dca08f89788e5995829190522f0b65518ba4662a data/numismatics/recipes/crafting/orange_card.json +13b984e17c52cc24968f4fd1ba67b915243a4b27 data/numismatics/recipes/crafting/vendor.json +ce32a3a7c2a5564e84b30bb1b71007ca4adc985d data/numismatics/recipes/crafting/lime_authorized_card.json 7ab921d57812521611aa6185e5fe46af466fdf0c data/numismatics/recipes/crafting/yellow_id_card.json 42b664e5f199b76e54518baf529c2dfe434a929f data/numismatics/recipes/crafting/lime_id_card.json -39047da0807eb1054a179e6ecf63e85676a9f0a0 data/numismatics/advancements/recipes/misc/crafting/brass_depositor.json -f160e3f01433b3815e8734e0ae0ed7eadc19e53b data/numismatics/recipes/crafting/cyan_card.json -8fd00cd399cf9329a63b6264918372ebf90ad79b data/numismatics/recipes/crafting/light_gray_id_card.json -caff153f8b3751f805227c8fc20a145dae8406b6 data/numismatics/advancements/recipes/misc/crafting/light_gray_id_card.json -7ced89d9f2a4266155fc5e8b650ffbecac27fd6e data/numismatics/advancements/recipes/misc/crafting/lime_authorized_card.json -753e91e51246f8ac75ac67fbd3b912e663ba8ee8 data/numismatics/advancements/recipes/misc/crafting/purple_card.json -d518f47ea8446f1ebd592d7d74d96dec66755651 data/numismatics/recipes/crafting/gray_card.json -073f5238842a1e3bb7624479e6e061e25a6d551b data/numismatics/advancements/recipes/misc/crafting/gray_id_card.json -4f6314ea11c7524569cf9ea711e7d5dc90abee37 data/numismatics/advancements/recipes/misc/crafting/purple_authorized_card.json cf3fa950d39273b32ae4dde3ba84f77820d0cb25 data/numismatics/recipes/crafting/purple_id_card.json -a30c11ea13bb0d445ed47725ed4995dd291bc700 data/numismatics/advancements/recipes/misc/crafting/cyan_id_card.json -360f03b664bac1cf6fde98e1ec77ca6e93933c4a data/numismatics/advancements/recipes/misc/crafting/banking_guide.json +011bfd082068cb75738cb9ea54e5f76147c0436f data/numismatics/advancements/recipes/misc/crafting/black_card.json +d7a7609aa109440f0f47b8ba7c598d9f7a667734 data/numismatics/advancements/recipes/misc/crafting/blue_id_card.json +0d9dc5041578195c578860f7af550cae670b1016 data/numismatics/advancements/recipes/misc/crafting/cyan_authorized_card.json +6c3d017d9438e74552384a2b391ad5b6c5bb74e0 data/numismatics/recipes/crafting/magenta_authorized_card.json +3cfbeee014050f945e5fa2299dbbcfbf120bf29a data/numismatics/recipes/crafting/red_authorized_card.json +606c6054ab3ab165654c4de002c7e93d3f7fab3b data/numismatics/recipes/crafting/green_card.json +e91feedee6f602a6c19d39fd6a3c10f0fd17208f data/numismatics/recipes/crafting/brown_authorized_card.json +386f7cbc350f5448e31c71053309e48a71df15f1 data/numismatics/recipes/crafting/green_authorized_card.json +ff911cab5fbdab250fe0cf4822e6fbd4e5c99f2a data/numismatics/advancements/recipes/misc/crafting/blue_authorized_card.json diff --git a/common/src/generated/resources/.cache/816056b233c115f7af92c9ed2c207f096721f5cf b/common/src/generated/resources/.cache/816056b233c115f7af92c9ed2c207f096721f5cf index 54647b7..5a89984 100644 --- a/common/src/generated/resources/.cache/816056b233c115f7af92c9ed2c207f096721f5cf +++ b/common/src/generated/resources/.cache/816056b233c115f7af92c9ed2c207f096721f5cf @@ -1,2 +1,2 @@ -// 1.20.1 2024-08-08T14:22:14.204849223 Create: Numismatics/Numismatics EMI excluded tags +// 1.20.1 2024-09-02T18:45:23.008664281 Create: Numismatics/Numismatics EMI excluded tags b57edab6f7e7a6e1b1211daa4c3b217ffd09ce62 assets/emi/tag/exclusions/numismatics.json diff --git a/common/src/generated/resources/.cache/c6e4c19894bc5aece2976a0277ba8e1dbf023865 b/common/src/generated/resources/.cache/c6e4c19894bc5aece2976a0277ba8e1dbf023865 index 6158912..5001149 100644 --- a/common/src/generated/resources/.cache/c6e4c19894bc5aece2976a0277ba8e1dbf023865 +++ b/common/src/generated/resources/.cache/c6e4c19894bc5aece2976a0277ba8e1dbf023865 @@ -1 +1 @@ -// 1.20.1 2024-08-08T14:22:14.212185451 Create: Numismatics/Numismatics' Sequenced Assembly Recipes +// 1.20.1 2024-09-02T18:45:23.011438251 Create: Numismatics/Numismatics' Sequenced Assembly Recipes diff --git a/common/src/generated/resources/.cache/d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6 b/common/src/generated/resources/.cache/d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6 index 07c721c..5336259 100644 --- a/common/src/generated/resources/.cache/d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6 +++ b/common/src/generated/resources/.cache/d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6 @@ -1,122 +1,122 @@ -// 1.20.1 2024-08-08T14:22:14.206619846 Create: Numismatics/Registrate Provider for numismatics [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] -2f1dad2a2e0086d54cf4b88378feacc04341d87f data/numismatics/tags/items/internal/ingots/iron_ingots.json -dc5c60bbbaf3a5d7bc1f9bc0c9377757dbd8de49 data/numismatics/loot_tables/blocks/bank_terminal.json -5b0244502972f49d063d98fa0cb3f6fc65af82b2 data/numismatics/tags/items/internal/string.json -a96d3d02794064cd9be1bca25a9ba6217675e6c5 assets/numismatics/models/item/white_id_card.json -4d944b6e0e93a3444591a2e540530da0b2a0ff08 data/numismatics/tags/items/internal/dyes/light_blue_dyes.json -228b67a48aa045bfe809c54c756df80eb0765aad assets/numismatics/models/item/bank_terminal.json -bb2a77462e6213eddde134f3cc3e9a3f07f07f3f assets/numismatics/models/item/yellow_authorized_card.json -74a4c7ca7a48382782e5dba33018dfc8255192c5 assets/numismatics/models/block/brass_depositor_locked.json -3f0d912779200aaaf55bef102d9b96acead1a636 data/numismatics/tags/items/internal/dyes/purple_dyes.json -7b8c264836550fb74e40d923ddc02f4be873eef5 assets/numismatics/lang/en_us.json -377e460c0dcf6d7de1b7ae235959105a7c45e4c4 assets/numismatics/models/item/cyan_authorized_card.json -bde18ccd9c21484154597c6271750c0406082f61 data/forge/tags/blocks/relocation_not_supported.json -eca751589c40725750e2c2baa6607e83255fd5f4 assets/numismatics/models/item/brown_authorized_card.json -ad712dd2a2a7268dfa773f38a50d526952758d5c data/numismatics/tags/items/internal/dyes/cyan_dyes.json -84ab8c91452f94501b3acc31ec1e0bc64417f839 assets/numismatics/models/item/black_card.json -83ce6c9d27970b4c643f0f9f3dfeb58668fca3d4 assets/numismatics/models/item/banking_guide.json -8550097149cebbfd50bdeac2003327b60a4aee9a assets/numismatics/models/item/light_gray_card.json -95b492bd9230dc90fca9395c823cef39e644d8f2 assets/numismatics/models/item/sprocket.json +// 1.20.1 2024-09-02T18:45:23.009222191 Create: Numismatics/Registrate Provider for numismatics [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] 70c481f36a9718ac48632e6939ac6ba785be4c9e assets/numismatics/models/item/black_id_card.json -b7cfcad20fb12b64f8d9a89d286888115676b99a assets/numismatics/lang/en_ud.json -1e78f650091a4a2c43e36fb815f23d0591e058a6 assets/numismatics/models/item/magenta_card.json -909f5d14f23199c064f6b91a421bb7b15e0f1a7d assets/numismatics/models/item/orange_authorized_card.json -d6f017479b3cc538f73d7fb0a1e65d1742bab266 assets/numismatics/models/item/light_blue_id_card.json +95ef415a564eba1d212053195d25b199427b94e3 assets/numismatics/blockstates/creative_vendor.json 4458283178334ae169a7cbbd1aa09067cbb99ee7 data/numismatics/tags/items/internal/dyes/green_dyes.json -ad693bfb3bb45d661f989071bd896e3020fcbe87 assets/numismatics/models/item/pink_card.json -cca7e7be961c6ed6272f19211bb17707b7934155 assets/numismatics/models/item/creative_vendor.json +ee60b7c614946045f0671976ef12e43151c33ce1 assets/numismatics/models/item/blue_id_card.json +d4a1c85981d65856c193ab03677c076caa8e7b23 data/numismatics/loot_tables/blocks/salepoint.json +4f78ca868db20495aa20be7c6a14e2678fb16f9f assets/numismatics/models/block/andesite_depositor_locked.json 7ebbfe751724c7a9b8b57cd9b4aae2a71a8da840 assets/numismatics/models/item/green_id_card.json -5a9acd5e1dddb653eb91c82108679cb013dab46f assets/numismatics/models/item/salepoint.json -5f6e841fc0eae95df179de8d4b2eae325a19e015 data/numismatics/tags/items/cards.json -b5533a44ad137e21ee8aab5c200f673d1e8a235f assets/numismatics/models/item/pink_id_card.json -facbd710d107ebc9b2c6ddfa3b59a16d5f85c992 assets/numismatics/models/item/spur.json +ad693bfb3bb45d661f989071bd896e3020fcbe87 assets/numismatics/models/item/pink_card.json f6ee547a5678792e225e7d897c559d7493918844 data/numismatics/tags/items/internal/plates/gold_plates.json +77de205f7ee2b6736ece646c399aaa194def42f0 assets/numismatics/models/item/brown_card.json +b6efde0135fab023b1b51f219254e5e9d7439f6a assets/numismatics/models/item/cog.json +0df8c2e77d6563fa3899070a6463d81b95e65cf0 data/numismatics/tags/items/authorized_cards.json +17b5bc6d0bfd98157c3d2ed8ee6ebc81fd6d7599 data/numismatics/tags/items/internal/nuggets/iron_nuggets.json +5a9acd5e1dddb653eb91c82108679cb013dab46f assets/numismatics/models/item/salepoint.json +aa33ee01db639fab9233c60ea40d8af0b3c7500b assets/numismatics/blockstates/salepoint.json +3f0d912779200aaaf55bef102d9b96acead1a636 data/numismatics/tags/items/internal/dyes/purple_dyes.json +eca751589c40725750e2c2baa6607e83255fd5f4 assets/numismatics/models/item/brown_authorized_card.json 6cb764824a2190dab6219b7502ec77f14c1a90e0 data/numismatics/loot_tables/blocks/creative_vendor.json -52b48750de8a5a571a08bce3f2f025474153d50b assets/numismatics/models/item/bevel.json -2a6aaab63efb82be5fee5de0f9d96824d520b25e data/numismatics/tags/items/internal/dyes/blue_dyes.json -fd289500be71ae25ed8c08b5f9fea41054cf6a61 assets/numismatics/models/item/brown_id_card.json -411b79f79547a0adcb665bf7440e8169f7dcb24e assets/numismatics/models/block/brass_depositor.json -921085f1caf23e8fd003fc38c439270950a306c3 assets/numismatics/models/item/gray_card.json +377e460c0dcf6d7de1b7ae235959105a7c45e4c4 assets/numismatics/models/item/cyan_authorized_card.json +bde18ccd9c21484154597c6271750c0406082f61 data/c/tags/blocks/relocation_not_supported.json +bde18ccd9c21484154597c6271750c0406082f61 data/forge/tags/blocks/relocation_not_supported.json +a2ff135c1fea203b49dbbf4cae010664aa1cf909 assets/numismatics/models/item/magenta_id_card.json +5849c2cae2ca479893e1e4063d2efb75eada281a assets/numismatics/models/item/cyan_id_card.json 7b126eb3ff0b2e9af171e5464fc9ff9f7fcfd653 assets/numismatics/models/item/lime_card.json -ee60b7c614946045f0671976ef12e43151c33ce1 assets/numismatics/models/item/blue_id_card.json +9ac23febc1b0d808cb545b3cdda93fae40081b3d assets/numismatics/models/item/brass_depositor.json +5ec9eeaf96af5a8587ec71a9bcf3a5728f99c33d data/minecraft/tags/blocks/mineable/axe.json +a96d3d02794064cd9be1bca25a9ba6217675e6c5 assets/numismatics/models/item/white_id_card.json +c1863c2bd08a5910a534aee0dcbc61a352fb9577 assets/numismatics/models/item/white_card.json +e720c18026dc758acf223c2e6247ca3bf4852b59 assets/numismatics/models/item/magenta_authorized_card.json +e1087e56db7b4d8812ab4617344f0ac8b0f0e6c7 assets/numismatics/models/item/light_gray_authorized_card.json +0d06a3a44565e63cf98c451e7a4a6c28681d49be assets/numismatics/models/item/red_id_card.json +4d944b6e0e93a3444591a2e540530da0b2a0ff08 data/numismatics/tags/items/internal/dyes/light_blue_dyes.json 890e519d407cab18c04ee439e7d5f67eb4f76ab3 assets/numismatics/models/item/blaze_banker.json -090a0f41ed3b7739c4d4768e30a0b1de8986825e assets/numismatics/models/item/pink_authorized_card.json +8fd12493390894fa5b3988f499f758c17137af16 assets/numismatics/models/item/sun.json +27788e1854c12b323c1fe5945858fce4d1544e3c data/numismatics/tags/items/internal/dyes/white_dyes.json +41b79e319044d6179f7757f73ef67c9acdbfe87d assets/numismatics/models/item/lime_id_card.json +36e1dad2803241c11c646b9737be8af6d67ef8fe data/c/tags/items/string.json +dcf8ea4cef1226fb52d84359d1d2ff403ddb556a assets/numismatics/models/item/orange_id_card.json c1878dd808cf36e400e13885adfab22b60ac291e assets/numismatics/models/item/purple_id_card.json +9c20dd40c03605721d0231ffde829d55e36b1c05 assets/numismatics/models/item/yellow_card.json c05836600bd1689f598515841869634b1d709cca assets/numismatics/models/item/yellow_id_card.json -ce821bcccb920fd51237904e253fb29100882648 data/numismatics/tags/items/internal/dyes/brown_dyes.json -a28cf7778f3cf79ca94ac5196ce4aee934961519 assets/numismatics/models/item/cyan_card.json -aa33ee01db639fab9233c60ea40d8af0b3c7500b assets/numismatics/blockstates/salepoint.json -8fd12493390894fa5b3988f499f758c17137af16 assets/numismatics/models/item/sun.json -c71ebb661adcdddcecd0f74c062718c3e55c1af4 data/create/tags/blocks/fan_transparent.json -99e3dd233c66e14a6e572e332ac8b7af1f8ed94e assets/numismatics/models/item/orange_card.json -bde18ccd9c21484154597c6271750c0406082f61 data/c/tags/blocks/relocation_not_supported.json -0df8c2e77d6563fa3899070a6463d81b95e65cf0 data/numismatics/tags/items/authorized_cards.json -187e917e6a02d61b15493f292d7b1db2151ddfd0 assets/numismatics/models/item/crown.json -d048d04208faa63f0014d614d6026a66fe118c11 data/numismatics/loot_tables/blocks/brass_depositor.json -790ff3c5da6a67a5de1ceb7138fa3e1c0fe97f80 data/numismatics/tags/items/internal/dyes/lime_dyes.json +4e3215ab9d54a9e751caa9a946ad54da40586789 assets/numismatics/models/item/purple_card.json a8cb82f19034a0e724e12df45c883e9cd469c210 assets/numismatics/models/item/green_card.json -e1087e56db7b4d8812ab4617344f0ac8b0f0e6c7 assets/numismatics/models/item/light_gray_authorized_card.json -390db78c5393fca4f90018df51d1a79d11a64f72 assets/numismatics/models/item/light_blue_authorized_card.json -c09892d2d189f147997d77f4ce39b0570729f030 assets/numismatics/models/item/lime_authorized_card.json +2a6aaab63efb82be5fee5de0f9d96824d520b25e data/numismatics/tags/items/internal/dyes/blue_dyes.json 06ecd28cd97f4e8200dc396858695cad57b871c8 assets/numismatics/blockstates/blaze_banker.json -95ef415a564eba1d212053195d25b199427b94e3 assets/numismatics/blockstates/creative_vendor.json +cca7e7be961c6ed6272f19211bb17707b7934155 assets/numismatics/models/item/creative_vendor.json 9fdcd12c871f136e66973a8c02be94a675a4b727 data/numismatics/tags/items/internal/dyes/yellow_dyes.json +0e4add47ede4986c6535d74c058d424a4960b36e assets/numismatics/models/item/white_authorized_card.json +dc5c60bbbaf3a5d7bc1f9bc0c9377757dbd8de49 data/numismatics/loot_tables/blocks/bank_terminal.json +7b8c264836550fb74e40d923ddc02f4be873eef5 assets/numismatics/lang/en_us.json +19ec5fcb01ad98ac0abcc475186794534729a273 data/minecraft/tags/blocks/mineable/pickaxe.json +facbd710d107ebc9b2c6ddfa3b59a16d5f85c992 assets/numismatics/models/item/spur.json +d6f017479b3cc538f73d7fb0a1e65d1742bab266 assets/numismatics/models/item/light_blue_id_card.json +b7cfcad20fb12b64f8d9a89d286888115676b99a assets/numismatics/lang/en_ud.json +b60a4818cad76e2fecad9750f7d576cf5528b5a8 assets/numismatics/models/item/red_authorized_card.json e62db1a880d468865769307ad19f16d9b7dac7c1 data/numismatics/tags/items/internal/dyes/light_gray_dyes.json c5958ebbc2782c2611690c642713cadc59656814 assets/numismatics/models/item/light_blue_card.json -224bcb5095af5ab25eb16ab0d9c1993323734cf9 data/numismatics/tags/items/internal/nuggets/zinc_nuggets.json -2449b7346e1657ef1c6ab4c134aab55b216ec783 assets/numismatics/models/item/andesite_depositor.json -a6a8db1faafaf7833406120a76fe5c21eb21d2e6 data/numismatics/tags/items/id_cards.json +bb2a77462e6213eddde134f3cc3e9a3f07f07f3f assets/numismatics/models/item/yellow_authorized_card.json +9e6e50d40e3688ae681107e60ac5ff5fc22585f9 data/numismatics/loot_tables/blocks/andesite_depositor.json +265ef24d62bc7580e763e1fb6802bf4e58dc0194 assets/numismatics/models/block/andesite_depositor.json +2f1dad2a2e0086d54cf4b88378feacc04341d87f data/numismatics/tags/items/internal/ingots/iron_ingots.json +d2b105f0657bad99b8efed45dc0a8df8ff775c10 assets/numismatics/blockstates/vendor.json +090a0f41ed3b7739c4d4768e30a0b1de8986825e assets/numismatics/models/item/pink_authorized_card.json +6965cf99471bb8c63f5f8a94577e2cddc3b2bc33 assets/numismatics/models/item/vendor.json +ac8c537dfc0e6704a0abe4f47130c41b19cde231 data/numismatics/tags/items/internal/dyes/magenta_dyes.json +62ab2750314492e8da73768bd891faee34cfdcd6 data/numismatics/tags/items/internal/dyes/red_dyes.json +790ff3c5da6a67a5de1ceb7138fa3e1c0fe97f80 data/numismatics/tags/items/internal/dyes/lime_dyes.json +d048d04208faa63f0014d614d6026a66fe118c11 data/numismatics/loot_tables/blocks/brass_depositor.json +c09892d2d189f147997d77f4ce39b0570729f030 assets/numismatics/models/item/lime_authorized_card.json +6f77b42eb7ac7888619ea7c96f7d560ec1ec3db6 assets/numismatics/models/item/green_authorized_card.json d4b100dee3fb5ad235f06a247a4c2c0ed04d1e0d data/numismatics/tags/blocks/internal/relocation_not_supported.json -dada04ceb5107ca4b311d8085ca699deda3c60de assets/numismatics/models/item/black_authorized_card.json -3961fdf3030140fc32e0e8c1d440ac395e62f5b6 assets/numismatics/blockstates/bank_terminal.json +4373efd028cba9accc610231c11f559821bc7f1c data/numismatics/tags/blocks/numismatics_blocks.json +5f6e841fc0eae95df179de8d4b2eae325a19e015 data/numismatics/tags/items/cards.json 6dfeabbb1336aa18bd42d7ab4de00a6ead2f7270 assets/numismatics/models/item/gray_authorized_card.json -182450e6ad4229f2959e6c50e38ef6e2ff5259d0 data/numismatics/tags/items/internal/dyes/orange_dyes.json -9e6e50d40e3688ae681107e60ac5ff5fc22585f9 data/numismatics/loot_tables/blocks/andesite_depositor.json +a2dec3b886deae84d88babd6fb1ce2997d193533 data/numismatics/tags/items/coins.json +b5533a44ad137e21ee8aab5c200f673d1e8a235f assets/numismatics/models/item/pink_id_card.json 3c36bec4bc30ac2bd5f0e0c881d6505b5cce35fe data/numismatics/loot_tables/blocks/vendor.json -0e4add47ede4986c6535d74c058d424a4960b36e assets/numismatics/models/item/white_authorized_card.json +99bfe9fe8c163701a2a9784d29f26fa2b67d54d3 assets/numismatics/models/item/gray_id_card.json +c71ebb661adcdddcecd0f74c062718c3e55c1af4 data/create/tags/blocks/fan_transparent.json +1e78f650091a4a2c43e36fb815f23d0591e058a6 assets/numismatics/models/item/magenta_card.json +3961fdf3030140fc32e0e8c1d440ac395e62f5b6 assets/numismatics/blockstates/bank_terminal.json +52b48750de8a5a571a08bce3f2f025474153d50b assets/numismatics/models/item/bevel.json 82bc77ac080aa62bc6cdf0a932f4e80de50412dc data/numismatics/tags/items/internal/dyes/pink_dyes.json -77de205f7ee2b6736ece646c399aaa194def42f0 assets/numismatics/models/item/brown_card.json -a2ff135c1fea203b49dbbf4cae010664aa1cf909 assets/numismatics/models/item/magenta_id_card.json -9ac23febc1b0d808cb545b3cdda93fae40081b3d assets/numismatics/models/item/brass_depositor.json -56973a6ce09377c8f235f46aa4d71a2a9fabf587 assets/numismatics/models/item/red_card.json +a7e754dd80af7eff6447f4376b98ebe4eb54e7d6 data/numismatics/tags/items/internal/dyes/black_dyes.json +160d556c6bfdb651082b39784258f6d06c21ca8f assets/numismatics/blockstates/brass_depositor.json +187e917e6a02d61b15493f292d7b1db2151ddfd0 assets/numismatics/models/item/crown.json +2449b7346e1657ef1c6ab4c134aab55b216ec783 assets/numismatics/models/item/andesite_depositor.json +224bcb5095af5ab25eb16ab0d9c1993323734cf9 data/numismatics/tags/items/internal/nuggets/zinc_nuggets.json +8550097149cebbfd50bdeac2003327b60a4aee9a assets/numismatics/models/item/light_gray_card.json +fd289500be71ae25ed8c08b5f9fea41054cf6a61 assets/numismatics/models/item/brown_id_card.json +5b0244502972f49d063d98fa0cb3f6fc65af82b2 data/numismatics/tags/items/internal/string.json +88219edf7b658e79cfaeead5e314dab8db133f79 assets/numismatics/models/item/blue_authorized_card.json +b1f339ffecbae2c812e18a1286162d31429ce356 data/numismatics/tags/items/internal/dyes/gray_dyes.json 4a6ca666740b098929798ad132260f288cc228c0 data/numismatics/tags/items/internal/ingots/copper_ingots.json +a6a8db1faafaf7833406120a76fe5c21eb21d2e6 data/numismatics/tags/items/id_cards.json +228b67a48aa045bfe809c54c756df80eb0765aad assets/numismatics/models/item/bank_terminal.json +3e282ab122ced259d5d9bfa58010e71f7e8372f0 assets/numismatics/models/item/purple_authorized_card.json +a28cf7778f3cf79ca94ac5196ce4aee934961519 assets/numismatics/models/item/cyan_card.json +921085f1caf23e8fd003fc38c439270950a306c3 assets/numismatics/models/item/gray_card.json 36e1dad2803241c11c646b9737be8af6d67ef8fe data/forge/tags/items/string.json -b1f339ffecbae2c812e18a1286162d31429ce356 data/numismatics/tags/items/internal/dyes/gray_dyes.json -b6efde0135fab023b1b51f219254e5e9d7439f6a assets/numismatics/models/item/cog.json -88219edf7b658e79cfaeead5e314dab8db133f79 assets/numismatics/models/item/blue_authorized_card.json -19ec5fcb01ad98ac0abcc475186794534729a273 data/minecraft/tags/blocks/mineable/pickaxe.json -36e1dad2803241c11c646b9737be8af6d67ef8fe data/c/tags/items/string.json -27788e1854c12b323c1fe5945858fce4d1544e3c data/numismatics/tags/items/internal/dyes/white_dyes.json +d38d7d40599c66ac84ef7dd2c1635d3ba7794871 data/numismatics/tags/items/internal/nuggets/brass_nuggets.json +ad712dd2a2a7268dfa773f38a50d526952758d5c data/numismatics/tags/items/internal/dyes/cyan_dyes.json +182450e6ad4229f2959e6c50e38ef6e2ff5259d0 data/numismatics/tags/items/internal/dyes/orange_dyes.json +390db78c5393fca4f90018df51d1a79d11a64f72 assets/numismatics/models/item/light_blue_authorized_card.json +56973a6ce09377c8f235f46aa4d71a2a9fabf587 assets/numismatics/models/item/red_card.json d8cbe7ed6240d173706913cc3548e2f77b0f33a1 data/numismatics/tags/items/numismatics_items.json -5ec9eeaf96af5a8587ec71a9bcf3a5728f99c33d data/minecraft/tags/blocks/mineable/axe.json -6965cf99471bb8c63f5f8a94577e2cddc3b2bc33 assets/numismatics/models/item/vendor.json -5849c2cae2ca479893e1e4063d2efb75eada281a assets/numismatics/models/item/cyan_id_card.json -b60a4818cad76e2fecad9750f7d576cf5528b5a8 assets/numismatics/models/item/red_authorized_card.json -6f77b42eb7ac7888619ea7c96f7d560ec1ec3db6 assets/numismatics/models/item/green_authorized_card.json -160d556c6bfdb651082b39784258f6d06c21ca8f assets/numismatics/blockstates/brass_depositor.json -dcf8ea4cef1226fb52d84359d1d2ff403ddb556a assets/numismatics/models/item/orange_id_card.json -4f78ca868db20495aa20be7c6a14e2678fb16f9f assets/numismatics/models/block/andesite_depositor_locked.json +266d9b0eb6fdecc4bcf6da465078d059009a3b54 data/numismatics/loot_tables/blocks/blaze_banker.json f7f43dd6d567ec8303c73b79409bc92d8b56574a assets/numismatics/blockstates/andesite_depositor.json -0d06a3a44565e63cf98c451e7a4a6c28681d49be assets/numismatics/models/item/red_id_card.json +411b79f79547a0adcb665bf7440e8169f7dcb24e assets/numismatics/models/block/brass_depositor.json +99e3dd233c66e14a6e572e332ac8b7af1f8ed94e assets/numismatics/models/item/orange_card.json +83ce6c9d27970b4c643f0f9f3dfeb58668fca3d4 assets/numismatics/models/item/banking_guide.json +ce821bcccb920fd51237904e253fb29100882648 data/numismatics/tags/items/internal/dyes/brown_dyes.json +909f5d14f23199c064f6b91a421bb7b15e0f1a7d assets/numismatics/models/item/orange_authorized_card.json +74a4c7ca7a48382782e5dba33018dfc8255192c5 assets/numismatics/models/block/brass_depositor_locked.json +b3293e39ea5d4a1fdf65d014ec370b328ae36949 assets/numismatics/models/item/light_gray_id_card.json +95b492bd9230dc90fca9395c823cef39e644d8f2 assets/numismatics/models/item/sprocket.json fa326874015c5f24f6a65390c31f96324eecc96d assets/numismatics/models/item/blue_card.json -266d9b0eb6fdecc4bcf6da465078d059009a3b54 data/numismatics/loot_tables/blocks/blaze_banker.json -4e3215ab9d54a9e751caa9a946ad54da40586789 assets/numismatics/models/item/purple_card.json -d2b105f0657bad99b8efed45dc0a8df8ff775c10 assets/numismatics/blockstates/vendor.json -e720c18026dc758acf223c2e6247ca3bf4852b59 assets/numismatics/models/item/magenta_authorized_card.json d36f0cc1a6b0873730d353bd84dda701d169265b data/numismatics/tags/items/internal/plates/iron_plates.json -a2dec3b886deae84d88babd6fb1ce2997d193533 data/numismatics/tags/items/coins.json -3e282ab122ced259d5d9bfa58010e71f7e8372f0 assets/numismatics/models/item/purple_authorized_card.json -b3293e39ea5d4a1fdf65d014ec370b328ae36949 assets/numismatics/models/item/light_gray_id_card.json -62ab2750314492e8da73768bd891faee34cfdcd6 data/numismatics/tags/items/internal/dyes/red_dyes.json -c1863c2bd08a5910a534aee0dcbc61a352fb9577 assets/numismatics/models/item/white_card.json -d38d7d40599c66ac84ef7dd2c1635d3ba7794871 data/numismatics/tags/items/internal/nuggets/brass_nuggets.json -ac8c537dfc0e6704a0abe4f47130c41b19cde231 data/numismatics/tags/items/internal/dyes/magenta_dyes.json -265ef24d62bc7580e763e1fb6802bf4e58dc0194 assets/numismatics/models/block/andesite_depositor.json -a7e754dd80af7eff6447f4376b98ebe4eb54e7d6 data/numismatics/tags/items/internal/dyes/black_dyes.json -4373efd028cba9accc610231c11f559821bc7f1c data/numismatics/tags/blocks/numismatics_blocks.json -9c20dd40c03605721d0231ffde829d55e36b1c05 assets/numismatics/models/item/yellow_card.json -d4a1c85981d65856c193ab03677c076caa8e7b23 data/numismatics/loot_tables/blocks/salepoint.json -41b79e319044d6179f7757f73ef67c9acdbfe87d assets/numismatics/models/item/lime_id_card.json -99bfe9fe8c163701a2a9784d29f26fa2b67d54d3 assets/numismatics/models/item/gray_id_card.json +84ab8c91452f94501b3acc31ec1e0bc64417f839 assets/numismatics/models/item/black_card.json +dada04ceb5107ca4b311d8085ca699deda3c60de assets/numismatics/models/item/black_authorized_card.json c71ebb661adcdddcecd0f74c062718c3e55c1af4 data/create/tags/blocks/passive_boiler_heaters.json -17b5bc6d0bfd98157c3d2ed8ee6ebc81fd6d7599 data/numismatics/tags/items/internal/nuggets/iron_nuggets.json diff --git a/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlocks.java b/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlocks.java index e5da3bb..845f287 100644 --- a/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlocks.java +++ b/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlocks.java @@ -142,7 +142,7 @@ public class NumismaticsBlocks { .initialProperties(SharedProperties::softMetal) .properties(p -> p.strength(1.0F, 3600000.0F)) // Unexplodable .properties(Properties::requiresCorrectToolForDrops) - .properties(p -> p.isRedstoneConductor(Blocks::never)) + .properties(p -> p.isRedstoneConductor((state, getter, pos) -> false)) .transform(pickaxeOnly()) .lang("Salepoint") .transform(BuilderTransformers.salepoint()) diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts index 982a694..1a153c7 100644 --- a/fabric/build.gradle.kts +++ b/fabric/build.gradle.kts @@ -87,9 +87,10 @@ dependencies { modLocalRuntime("dev.emi:emi-fabric:${"emi_version"()}") // Steam 'n' Rails - modCompileOnly("com.railwayteam.railways:Steam_Rails-fabric-${"minecraft_version"()}:${"snr_version"()}+fabric-mc${"minecraft_version"()}") { isTransitive = false } + val buildNumber = if ("snr_build_number"() != "null") "-build." + "snr_build_number"() else "" + modCompileOnly("com.railwayteam.railways:Steam_Rails-fabric-${"minecraft_version"()}:${"snr_version"()}+fabric-mc${"minecraft_version"() + buildNumber}") { isTransitive = false } if ("enable_snr"().toBoolean()) { - modLocalRuntime("com.railwayteam.railways:Steam_Rails-fabric-${"minecraft_version"()}:${"snr_version"()}+fabric-mc${"minecraft_version"()}") { isTransitive = false } + modLocalRuntime("com.railwayteam.railways:Steam_Rails-fabric-${"minecraft_version"()}:${"snr_version"()}+fabric-mc${"minecraft_version"() + buildNumber}") { isTransitive = false } } // Carry On diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts index f49845e..6c287d5 100644 --- a/forge/build.gradle.kts +++ b/forge/build.gradle.kts @@ -84,9 +84,10 @@ dependencies { modLocalRuntime("mezz.jei:jei-${"minecraft_version"()}-forge:${"jei_version"()}") // Steam 'n' Rails - modCompileOnly("com.railwayteam.railways:Steam_Rails-forge-${"minecraft_version"()}:${"snr_version"()}+forge-mc${"minecraft_version"()}") { isTransitive = false } + val buildNumber = if ("snr_build_number"() != "null") "-build." + "snr_build_number"() else "" + modCompileOnly("com.railwayteam.railways:Steam_Rails-forge-${"minecraft_version"()}:${"snr_version"()}+forge-mc${"minecraft_version"() + buildNumber}") { isTransitive = false } if ("enable_snr"().toBoolean()) { - modLocalRuntime("com.railwayteam.railways:Steam_Rails-forge-${"minecraft_version"()}:${"snr_version"()}+forge-mc${"minecraft_version"()}") { isTransitive = false } + modLocalRuntime("com.railwayteam.railways:Steam_Rails-forge-${"minecraft_version"()}:${"snr_version"()}+forge-mc${"minecraft_version"() + buildNumber}") { isTransitive = false } } // Carry On diff --git a/gradle.properties b/gradle.properties index 432186f..932096a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -70,8 +70,10 @@ lazydfu_version = 0.1.3 jade_version = 11.10.0+fabric # Steam 'n' Rails -snr_version = 1.6.4 -enable_snr = true +# Leave snr_build_number as null if you want to use a release version +snr_version = 1.6.5 +snr_build_number = 1442 +enable_snr = false # Carry On - https://github.com/Tschipp/CarryOn carryon_forge_version = 2.1.2.7