Merge branch 'main' of https://github.com/game-design-driven/Create-Prepare-to-Dye

Author: Yarden-zamir

VERSION

@@ -1 +1 @@
-1.229.0
+1.230.0

config/modpack-update-checker/config.json

@@ -1 +1 @@
-{ "schemaVersion": 4, "currentVersion": "1.229.0", "modpackName": "Create Prepare to Dye", "modpackAuthor": "Create Prepare to Dye team", "githubRepo": "https://raw.githubusercontent.com/game-design-driven/Create-Prepare-to-Dye/main/modpack-update-checker/", "advanced": { "bccEnabled": false, "expandButton": true, "updateCheckerType": 2, "showAllChangelogsIfUpToDate": true, "forceModpackCompatible": true } }
+{ "schemaVersion": 4, "currentVersion": "1.230.0", "modpackName": "Create Prepare to Dye", "modpackAuthor": "Create Prepare to Dye team", "githubRepo": "https://raw.githubusercontent.com/game-design-driven/Create-Prepare-to-Dye/main/modpack-update-checker/", "advanced": { "bccEnabled": false, "expandButton": true, "updateCheckerType": 2, "showAllChangelogsIfUpToDate": true, "forceModpackCompatible": true } }

index.toml

@@ -26,7 +26,7 @@ hash = "48981474996310a7861d97b5aaea8a11ba16d6075c273766daab566848930c09"
 
 [[files]]
 file = "VERSION"
-hash = "508a811ea524f8a917ddaf8cde015dd02a58b33ec7ec483775e5234f03b1ef00"
+hash = "1350483f3a7d5d2cba7bc9bb11a624ff6d9a24ad863a47d20c63697bd5aa352e"
 
 [[files]]
 file = "config/MouseTweaks.cfg"
@@ -490,7 +490,7 @@ hash = "f5029b0a3ca477b85c097983a9c7d1747dc2f2fdff6ede904e3d11ba4ab169fa"
 
 [[files]]
 file = "config/modpack-update-checker/config.json"
-hash = "a35654711e44d35712853b0cdc4fa1df6c6e6a24805814f3d41394b40b8e6693"
+hash = "05d46c1b8ce56ba9ea214ca62150267f6bcd219520777410fd458a866119cd91"
 
 [[files]]
 file = "config/more_babies-common.toml"
@@ -3666,7 +3666,7 @@ hash = "ded1b3b51c1b47ee3e812ef73dfb4dd423dec7119ed921585bed038c95328c0d"
 
 [[files]]
 file = "kubejs/assets/sdrp/lang/en_us.json"
-hash = "0acb813ad1d3602045b28794e1ad854a69040a3280cb93b46c2fee009a450498"
+hash = "25f8bf41edd31a48e59ebaaa9ece41a36a23b0cdf54c315939a9ba36f385fd81"
 
 [[files]]
 file = "kubejs/assets/storagedrawers/lang/en_us.json"
@@ -11902,7 +11902,7 @@ hash = "93c6dbc1d292260a792d86fbd72804f31e7b12e5b6bc0dfb2d9cad3020d0d747"
 
 [[files]]
 file = "kubejs/server_scripts/base/features/bulkrecycle-command.js"
-hash = "7490dc9819fff232d19ad2a7ec62e4e658fb033ebc8e15e37626b1d7022fd7a5"
+hash = "7fa4b70b4c7a71b8c7b19e9d578d3a96db297f577046f95f12971bec0b9ddd87"
 
 [[files]]
 file = "kubejs/server_scripts/base/features/chickenEggs.js"
@@ -11934,7 +11934,7 @@ hash = "2f140c19f7c69a63a37e1304e71e73029211207aca59c45381590587dbfaadbd"
 
 [[files]]
 file = "kubejs/server_scripts/base/features/devices.js"
-hash = "06a8f9b248546362193cba14609540a7f874d8fc329e9f3d2d45e96f57811f0a"
+hash = "c3f78770d6ab83c80ed2e2649db4f141b3fdd94c28d67f709f107924ccc6eec4"
 
 [[files]]
 file = "kubejs/server_scripts/base/features/diamondToolsSilkTouch.js"
@@ -12378,15 +12378,15 @@ hash = "81fbbc72898372a704d5de9de110e818a84fa6f8fa10fd3a3a781af629965224"
 
 [[files]]
 file = "kubejs/translation_tools/missing_translations/zh_cn.missing.json"
-hash = "7dccd1b760d567da5a2919e4050abab6adc807326a27f0e3f40a2d20661eb288"
+hash = "7df5df588e6eec3773ab4364d90f1bff15968feba88f078d135a92fb95457d87"
 
 [[files]]
 file = "kubejs/translation_tools/supported_langs.json"
 hash = "85eb8219412efbf27a5f1bdde418a11fd606c07de4ea599177ad3f430655630c"
 
 [[files]]
 file = "modpack-update-checker/meta.json"
-hash = "e6dbaad44e26fe4d4bedd5229cada73e43f6a428ad0e7d97f2bbf94d7dfb0d28"
+hash = "d011891e17adac35125d36770c9443d1739dbfe56d35af89fc991dd5f7838002"
 
 [[files]]
 file = "modpack-update-checker/versions/1.100.0/changelog.txt"
@@ -14500,6 +14500,14 @@ hash = "24adf9dd4bbf43bca6947ed3b64f17ba9e78b82543f53e9700ea6d0725ff67c8"
 file = "modpack-update-checker/versions/1.229.0/changelog.txt"
 hash = "92f9d01ee0a0f04b62ddf85fac1d8e45c4cd9bdf12701bed591bffeeba8f82e8"
 
+[[files]]
+file = "modpack-update-checker/versions/1.229.1/changelog.txt"
+hash = "f18e7cc5582372ee4fa2665404458ef28eba715164e18d7d70cd5bd3504b8abc"
+
+[[files]]
+file = "modpack-update-checker/versions/1.230.0/changelog.txt"
+hash = "9b3b892de66e8cba8cc3f256b88fae773ef1af2c075b7fcefff44aa2e49fa301"
+
 [[files]]
 file = "modpack-update-checker/versions/1.79.33/changelog.txt"
 hash = "3ffee41ebf2c4f32db44a257c726f8496cc33446635821d2cf364ce80a6bef3e"

kubejs/assets/sdrp/lang/en_us.json

@@ -1 +1 @@
-{ "sdrp.logo": "Hanging out with Betsy on version 1.229.0", "sdrp.mainmenu": "Main Menu", "sdrp.overworld.in": "On Chroma Prime", "sdrp.overworld": "Chroma Prime" }
+{ "sdrp.logo": "Hanging out with Betsy on version 1.230.0", "sdrp.mainmenu": "Main Menu", "sdrp.overworld.in": "On Chroma Prime", "sdrp.overworld": "Chroma Prime" }

kubejs/server_scripts/base/features/bulkrecycle-command.js

@@ -10,7 +10,7 @@ function compactItems(player,keepOne){
   player.inventory.allItems.toArray().forEach(
     /** @param {Internal.ItemStack} i */
     i=>{
-      if(i.hasTag("forge:devices")){
+      if(i.hasTag("forge:devices") && !i.hasTag("ptdye:recycle_excluded") && !i.hasNBT()){
         let [_,type,fraction] = i.getTags()
           .toList()
           .filter((tag) => tag.location().path.startsWith("devices/"))[0]

kubejs/server_scripts/base/features/devices.js

@@ -490,6 +490,7 @@ if (true) {
 
   deviceDefinitions.forEach((device) => {
     if(!device.enable) return;
+    
     addToTag("forge:generics/devices", device.generic);
     addToTag(`forge:generics/${device.tag.split(":")[1]}`, device.generic);
     let generic_id = Item.of(device.generic).id; //support both ids and kjs items
@@ -546,6 +547,7 @@ if (true) {
         true
       ); //let players transmute any device but don't show in craftables panel
 
+      if(device.recycleExcluded) addToTag("ptdye:recycle_excluded")
       addToTag(device.tag + tagSuffix, item.id);
       addStonecutting(included_device, device.generic);
     });

modpack-update-checker/meta.json

@@ -0,0 +1,13 @@
+### [1.229.1](https://github.com/game-design-driven/Create-Prepare-to-Dye/compare/1.229.0...1.229.1) (2024-11-21)
+
+
+### Modlist related changes
+
+* update itemconverter ([eacdb1d](https://github.com/game-design-driven/Create-Prepare-to-Dye/commit/eacdb1d6dd2745ce1b5c60dc04b04625652698d2))
+
+
+### chores
+
+* autopublish 2024-11-20T05:54:15Z ([ac89ce2](https://github.com/game-design-driven/Create-Prepare-to-Dye/commit/ac89ce296230c603e50b214f3c04442de0539cc4))
+
+

modpack-update-checker/versions/1.229.1/changelog.txt

@@ -0,0 +1,13 @@
+## [1.230.0](https://github.com/game-design-driven/Create-Prepare-to-Dye/compare/1.229.1...1.230.0) (2024-11-22)
+
+
+### Features
+
+* exclude some devices from bulk recycling ([#622](https://github.com/game-design-driven/Create-Prepare-to-Dye/issues/622)) ([1e84ce7](https://github.com/game-design-driven/Create-Prepare-to-Dye/commit/1e84ce7edd6aaedc611d44607cd590ccd362d0d6))
+
+
+### chores
+
+* autopublish 2024-11-21T14:03:53Z ([267a244](https://github.com/game-design-driven/Create-Prepare-to-Dye/commit/267a244148e49e79317ff0f576cccd43623b9b9f))
+
+

modpack-update-checker/versions/1.230.0/changelog.txt

@@ -1,12 +1,12 @@
 name = "Create-Prepare-to-Dye"
 author = "yarden-zamir"
-version = "1.229.0"
+version = "1.230.0"
 pack-format = "packwiz:1.1.0"
 
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "40b5380b80313c3ff44f365903452d1e4e5abb7e449512b4ee9adebe885429c1"
+hash = "233c61419aca5b87af0afc005ca9886d9ff3a67c0545cd62a64c0dfde2d397cb"
 
 [versions]
 forge = "43.4.4"