From 9f01e65ab773857865c6b9657ade25d13c35198d Mon Sep 17 00:00:00 2001 From: lothrazar Date: Mon, 1 Apr 2024 10:26:31 -0700 Subject: [PATCH] 1.18.2 dependencies gradle update --- checkstyle.xml => .eclipse/checkstyle.xml | 0 build.gradle | 2 +- gradle.properties | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- update.json | 8 ++------ 5 files changed, 7 insertions(+), 11 deletions(-) rename checkstyle.xml => .eclipse/checkstyle.xml (100%) diff --git a/checkstyle.xml b/.eclipse/checkstyle.xml similarity index 100% rename from checkstyle.xml rename to .eclipse/checkstyle.xml diff --git a/build.gradle b/build.gradle index 3172baed7..82641228d 100644 --- a/build.gradle +++ b/build.gradle @@ -75,7 +75,7 @@ dependencies { minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}" // optional compat: jei plugin for custom recipes - implementation fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") + implementation fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}") // optional compat: many items useable in curios slots implementation fg.deobf("top.theillusivec4.curios:curios-forge:${mc_version}-${curios_version}") diff --git a/gradle.properties b/gradle.properties index 25a8d60a2..4c9893126 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,13 +8,13 @@ org.gradle.daemon=false curse_id=239286 -mod_version=1.7.17 +mod_version=1.7.18-SNAPSHOT mc_version=1.18.2 -forge_version=40.2.9 +forge_version=40.2.17 # optional dependencies -jei_version=9.7.1.255 +jei_version=10.2.1.1005 patchouli_version=71.1 curios_version=5.0.7.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb8790..ae04661ee 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/update.json b/update.json index 5e187672b..a4a7320d1 100644 --- a/update.json +++ b/update.json @@ -1,6 +1,5 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/cyclic", - "promos": { "1.18-latest": "1.6.7", "1.18.1-latest": "1.6.15", @@ -73,9 +72,7 @@ ,"1.5.9":"Fix Battery energy tooltip not updating when charged in an item slot. Added charging slot to Battery. Fix sleeping mat bug when used in nether. Fix Fluid cables visual disconnection when placing. " ,"1.5.10":"Machines that use fluid ingredients now accept fluid tags such as 'forge:experience' in place of fluid ID; updated some existing recipes on Solidifier and Evap Generator to match (old recipe JSONs still all compatible/valid). Fixed battery energy item stack capability provider. Refreshed texture of Air charm. Vision helmet compat with curios head slot. Revert GPS card fixes to v1.5.6. One recipe added to cyclic:generator_fluid for tag forge:biomass. Default config value updated for disable_pickup on the Sack of Holding. Add compat for Beheading enchant with the 7 Tinkers Construct mob heads (config heads are still checked last. no changes if tinkers not installed). " ,"1.5.11":"Fix a bugged interaction with Settings data card and Filter data card #1970 . Torch Charm now tries to avoid placing on non-solid blocks such as top side of a bottom Slab where the torch breaks right away. " - ,"1.5.12":"PR #1976 by metalshark :Item, Energy, and Fluid Cables now have Increased performance (compile time optimisations, reduction in cyclomatic complexity and removal of redundant checks) " - }, "1.18.2": { "1.6.0": "Ported Cyclic[1.16.5]-1.5.8 to Minecraft [1.17.1] & forge-37.0.85+. Altered a few crafting recipes to use new items. Removed Peat Generator (Use Peat items in Material Generator). Removed 5 Mason blocks, replaced with Compressed Cobblestone, Flint Block. Added Peace Candle, Translocation Platform, Stone Mattock, Crushing Macerator, and Lava Sponge. Added Copper Tools and Amethyst Tools, Copper Lantern, Copper Chain, Copper Bars, Gold Chain, Gold Bars, Gold Lantern (Art by @shynieke). Added Copper Nuggets and Netherite Nuggets. Added Netherite Lanterns, chains, and bars. Added 3 Pressure Plates: Copper Netherite and Obsidian. ", @@ -114,9 +111,8 @@ ,"1.7.14":"Added new config section [cyclic.potion] to disable BASE potion recipes. Marked minimum forge version of 40.1.84+ to prevent conflicts and errors. Fix lunchbox eating 'endless' items like Everlasting Beef. Lunchbox now can be inserted into while hovering with a food item, without opening gui-screen (texture shifts to indicate). New command /cyclic scoreboard orandom; works the same as /cyclic scoreboard random except it takes objectives as arguments for min and max values. Merge pull request #2219 from nexonerr/fluid_gen_fluid_filter Fixed issue #2096 " ,"1.7.15":"Life Leech no longer refills hunger (#2241). Merged Typo: double 'consume' (#2275)@Pifanjr. Update Simplified Chinese Transaction (#2277)@UraraChiya. " ,"1.7.16":"Fix #2243 User output buffer (milk and other tranforming outputs from entity interactions). fix #2236 recipe conflict for moss block in solidifier_moss_block.json. fix #2247 Charm Talisman Missing lava protection. Fix #2259: crates and other heavy blocks that keep their contents now drop motionless to avoid bouncing away for small base situations. #2261 Smooth glass can be reverse-smelted back into plain glass. Fix items that use RF not charging items on servers #2274 #2169. fix #2272 #2260 typos. Fix #2268 material generator recipe. update candle models from #2182. Fix Smooth Glass looks incorrect underwater #2263. Fix Tempered dark glass does not cull against itself #2262 " - ,"1.7.17":"This update ports some features that had previously been exlusive to the mc 1.16.5-1.15.12 thru 1.16.5-1.15.21; all are listed below. New configs: [cyclic.enchantment.disarm] now has 'ignoredMobs' and 'percentPerLevel', [cyclic.items.tile_transporter] now has 'overrideChestSingle', read on or see cyclic.yml for more details. PR #1976 by metalshark :Item, Energy, and Fluid Cables now have Increased performance (compile time optimisations, reduction in cyclomatic complexity and removal of redundant checks). PR #1994 by 'metalshark' Fixes issue #1992. Merge pull request #2013 from metalshark : Add caching of packager recipes and move static methods out of main class for scaling. Merge pull request #2011 from metalshark : Invalidate capabilities when declaring them. #1933 Sack of Holding chest placement override added, with new config to revert back to legacy behavior if desired (overrideChestSingle). #2168 fix bug where ender shelf sometimes would not save contents when mined after exiting reloading world when client data desyncs. Added a percentage config and ignorelist config for cyclic:disarm enchantment (disarmPercentPerLevel, disarmIngoredMobs), resolves it dropping your copied weapon from alexsmobs:mimicube #2249. Fix #1878 layered and/or logic for multiple wireless transmitters on the same node. Now all git branches can be merged from mc-1.16.5 downstream to mc-1.20.1 and future updates as well. " - - + ,"1.7.18":"" + } }