diff --git a/config/Mekanism/client.toml b/config/Mekanism/client.toml index 9fd34ae..59ffec9 100644 --- a/config/Mekanism/client.toml +++ b/config/Mekanism/client.toml @@ -22,6 +22,8 @@ alignHUDLeft = true #Show particles when machines active. machineEffects = true + #Enable item information HUD during gameplay + enableHUD = true #How much light to produce if ambient lighting is enabled. #Range: 1 ~ 15 ambientLightingLevel = 15 diff --git a/config/Mekanism/general.toml b/config/Mekanism/general.toml index 3d2007c..67386d3 100644 --- a/config/Mekanism/general.toml +++ b/config/Mekanism/general.toml @@ -11,6 +11,9 @@ allowChunkloading = true #Energy needed to destroy or attract blocks with a Laser (per block hardness level). laserEnergyNeededPerHardness = 100000 + #Number of ticks required to mine a single block with a Digital Miner (without any upgrades). + #Range: > 1 + digitalMinerTicksPerMine = 80 #Amount of heat produced per fuel tick of a fuel's burn time in the Fuelwood Heater. heatPerFuelTick = 4.0 #Scuba Tank Gas Tank capacity in mB. @@ -30,7 +33,7 @@ opsBypassRestrictions = false #Energy multiplier for using silk touch mode with the Digital Miner. minerSilkMultiplier = 6 - #Maximum radius in blocks that the Digital Miner can reach. (Increasing this may have negative effects on stability and/or performance. We strongly recommend you leave it at the default value.) + #Maximum radius in blocks that the Digital Miner can reach. (Increasing this may have negative effects on stability and/or performance. We strongly recommend you leave it at the default value). #Range: > 1 digitalMinerMaxRadius = 32 #Base factor for working out machine performance with upgrades - UpgradeModifier * (UpgradesInstalled/UpgradesPossible). diff --git a/config/caelus-client.toml b/config/caelus-client.toml new file mode 100644 index 0000000..bab97ca --- /dev/null +++ b/config/caelus-client.toml @@ -0,0 +1,8 @@ + +#Client only settings, mostly things related to rendering +[client] + #Set to true to enable holding down the Trigger Elytra keybind to automatically use a firework from inventory to takeoff from ground level + simpleTakeoff = true + #Set to true to enable an icon that appears on the HUD when elytra flight is disabled + toggleIcon = true + diff --git a/config/corail_woodcutter-client.toml b/config/corail_woodcutter-client.toml new file mode 100644 index 0000000..f2e4c23 --- /dev/null +++ b/config/corail_woodcutter-client.toml @@ -0,0 +1,6 @@ + +#Personal Options that can be edited even on server +[client] + #Display the stonecutting recipes in a custom category in JEI - depending if you're on a server or singleplayer, this option requires to relog on the server or restart your client [false/true|default:true] + stonecutting_support_in_jei = true + diff --git a/config/curios-client.toml b/config/curios-client.toml new file mode 100644 index 0000000..f5c5170 --- /dev/null +++ b/config/curios-client.toml @@ -0,0 +1,21 @@ + +#Client only settings, mostly things related to rendering +[client] + #The corner for the Curios GUI button + #Allowed Values: TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT + buttonCorner = "TOP_LEFT" + #The X-Offset for the Curios GUI button + #Range: -100 ~ 100 + buttonXOffset = 0 + #The Y-Offset for the Creative Curios GUI button + #Range: -100 ~ 100 + creativeButtonYOffset = 0 + #Set to true to enable rendering curios + renderCurios = true + #The X-Offset for the Creative Curios GUI button + #Range: -100 ~ 100 + creativeButtonXOffset = 0 + #The Y-Offset for the Curios GUI button + #Range: -100 ~ 100 + buttonYOffset = 0 + diff --git a/config/curios-common.toml b/config/curios-common.toml new file mode 100644 index 0000000..b4a63f0 --- /dev/null +++ b/config/curios-common.toml @@ -0,0 +1,7 @@ + +[common] + #List of curio types to create.Sizes can be defined by adding a semicolon and the size number (e.g. 'ring;4'). + createCurios = [] + #List of curio types to disable by default + disabledCurios = [] + diff --git a/config/cyclic.toml b/config/cyclic.toml new file mode 100644 index 0000000..f686626 --- /dev/null +++ b/config/cyclic.toml @@ -0,0 +1,6 @@ + +#General settings +[cyclic] + #Testing only, this does nothing + itemTooltip = true + diff --git a/config/dynview-common.toml b/config/dynview-common.toml new file mode 100644 index 0000000..b794220 --- /dev/null +++ b/config/dynview-common.toml @@ -0,0 +1,17 @@ + +["Dynamic chunk view distance settings"] + #The maximum chunk view distance allowed to use, set to the max which a player could benefit from. default: 20 + #Range: 1 ~ 200 + maxChunkViewDist = 20 + #The average tick time to stabilize the chunk view distance around, setting it higher than 50ms is not advised, as after 50ms the tps will go below 20. default:40ms + #Range: 10 ~ 100 + meanAvgTickTime = 45 + #The minimum chunk view distance allowed to use, set to what players should get at least. default: 4 + #Range: 1 ~ 200 + minChunkViewDist = 4 + #Whether to output log messages for actions done, its helpful to balance the other settings nicely. + logMessages = true + #The update frequency of average server tick time checks to update view distances, default is every 30 seconds + #Range: 1 ~ 1000 + viewDistanceUpdateRate = 30 + diff --git a/config/enchantability-common.toml b/config/enchantability-common.toml new file mode 100644 index 0000000..8f336ca --- /dev/null +++ b/config/enchantability-common.toml @@ -0,0 +1,40 @@ + +#Enabled Features +[features] + enableDexterity = true + enableHeat = false + enableStrike = true + enableAirWalker = true + enableVoid = true + enableFarReach = true + enableDeflection = true + enableGluttony = true + enableSmite = true + enableFastBreak = true + enableFirePraise = true + enableGravity = true + enableBlastResist = true + enableSwiftCharge = true + +#Enchant Configs +[enchants] + + #Dexterity + [enchants.dexterity] + dexterityTags = ["forge:sandstone", "forge:rods/wooden", "minecraft:fences", "forge:dyes", "minecraft:planks", "minecraft:arrows", "minecraft:signs", "minecraft:small_flowers", "minecraft:buttons", "minecraft:wooden_pressure_plates", "minecraft:rails", "forge:chests", "forge:leather"] + dexterityItems = ["minecraft:fire_charge", "minecraft:sugar", "minecraft:firework_star", "minecraft:bread"] + + #Gluttony + [enchants.gluttony] + enableRabbitStew = true + enableCookie = true + + #Heat + [enchants.heat] + #Range: > 1 + additionalTickSpeed = 3 + tileBlacklist = ["minecraft:hopper", "minecraft:piston", "minecraft:beacon", "minecraft:conduit", "minecraft:bell", "minecraft:beehive", "minecraft:daylight_detector", "minecraft:end_gateway", "enchantability:air"] + treatBlacklistAsWhitelist = false + #Range: 1 ~ 256 + "heatRange - radius" = 32 + diff --git a/config/mininggadgets-client.toml b/config/mininggadgets-client.toml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/config/mininggadgets-client.toml @@ -0,0 +1 @@ + diff --git a/config/mininggadgets-common.toml b/config/mininggadgets-common.toml new file mode 100644 index 0000000..a2b5728 --- /dev/null +++ b/config/mininggadgets-common.toml @@ -0,0 +1,67 @@ + +#Power settings +[power] + + #Upgrade Cost Settings + [power.upgrades] + #Cost per block for Efficiency 5 upgrade + #Range: > 0 + upgradeEfficiency5 = 50 + #Cost per Light Block placed + #Range: > 0 + upgradeLight = 100 + #Cost per block for Silk Touch upgrade + #Range: > 0 + upgradeSilkCost = 100 + #Cost per block Frozen + #Range: > 0 + upgradeFreeze = 100 + #Cost per block for Fortune 3 upgrade + #Range: > 0 + upgradeFortune3 = 100 + #Cost per block for Fortune 1 upgrade + #Range: > 0 + upgradeFortune1 = 30 + #Cost per block for Fortune 2 upgrade + #Range: > 0 + upgradeFortune2 = 60 + #Capacity Boost from Battery 1 Upgrade + #Range: > 0 + battery1 = 2000000 + #Capacity Boost from Battery 2 Upgrade + #Range: > 0 + battery2 = 5000000 + #Capacity Boost from Battery 3 Upgrade + #Range: > 0 + battery3 = 10000000 + #Cost per block for Heatsink upgrade + #Range: > 0 + upgradeHeatsink = 50 + #Cost per block for Efficiency 1 upgrade + #Range: > 0 + upgradeEfficiency1 = 10 + #Cost per block for Efficiency 2 upgrade + #Range: > 0 + upgradeEfficiency2 = 20 + #Cost per block for Magnet upgrade + #Range: > 0 + upgradeMagnet = 25 + #Cost per block for Void Junk upgrade + #Range: > 0 + upgradeVoid = 10 + #Cost per block for Efficiency 3 upgrade + #Range: > 0 + upgradeEfficiency3 = 30 + #Cost per block for Efficiency 4 upgrade + #Range: > 0 + upgradeEfficiency4 = 40 + + #Mining Gadget Settings + [power.mining_gadget] + #Base cost per block broken + #Range: > 0 + baseCost = 200 + #Maximum power for the Mining Gadget + #Range: > 0 + maxPower = 1000000 + diff --git a/config/patchouli-client.toml b/config/patchouli-client.toml new file mode 100644 index 0000000..b564505 --- /dev/null +++ b/config/patchouli-client.toml @@ -0,0 +1,5 @@ + +[client] + #Set this to true to use Shift instead of Ctrl for the inventory quick lookup feature. + quickLookupShift = false + diff --git a/config/silentgems-common.toml b/config/silentgems-common.toml index 84872e0..dfd566f 100644 --- a/config/silentgems-common.toml +++ b/config/silentgems-common.toml @@ -80,7 +80,7 @@ [chaos] #The most chaos the any source (player or world) can accumulate - maxValue = 10000000 + maxValue = 1 #Allows individual events to be disabled. #Note that disabling events will likely increase the frequency of other events. @@ -90,13 +90,13 @@ #Spawn a regular lightning bolt (can cause fire) "silentgems:lightning" = false #Changes the weather to a thunderstorm - "silentgems:thunderstorm" = true + "silentgems:thunderstorm" = false #Create a patch of corrupted blocks - "silentgems:corrupt_blocks" = true + "silentgems:corrupt_blocks" = false #Applies negative potion effects to the player - "silentgems:chaos_sickness" = true + "silentgems:chaos_sickness" = false #Spawn several lightning bolts that do not cause fire - "silentgems:chaos_lightning" = true + "silentgems:chaos_lightning" = false #Spawn a group of wisps (random element) "silentgems:spawn_wisps" = false diff --git a/config/tombstone-server.toml b/config/tombstone-server.toml index 5b8dabf..73050ee 100644 --- a/config/tombstone-server.toml +++ b/config/tombstone-server.toml @@ -1,31 +1,31 @@ #Miscellaneous options [general] - #Whether to handle player experience [false/true|default:true] - handle_player_xp = true #The duration of the Ghostly Shape effect in seconds [0..MAX|default:120] #Range: > 0 ghostly_shape_duration = 120 #Experience loss on death (%) [0..100|default:0] #Range: 0 ~ 100 xp_loss = 0 + #Whether to handle player experience [false/true|default:true] + handle_player_xp = true #The chance that a player receives an already enchanted Grave's Key on death [-1..100|default:0|disabled:-1] #Range: -1 ~ 100 chance_enchanted_graveKey = 0 + #Allows players with bad alignment and the perk tomb raider to steal items on abandoned graves [false/true|default:false] + allow_tomb_raiding = false #The time in minutes before a Grave's Key isn't required to open a grave (-1 = disabled) [-1..MAX|default:-1] #Range: > -1 decay_time = -1 - #Allows players with bad alignment and the perk tomb raider to steal items on abandoned graves [false/true|default:false] - allow_tomb_raiding = false #Allows to customize or disable the enchantments [enchantments] - #Shadow Step is only active while sneaking [false/true|default:false] - nerf_shadow_step = false #Enables the enchantment Shadow Step [false/true|default:true] enable_enchantment_shadow_step = true #Enables the enchantment Soulbound [false/true|default:true] enable_enchantment_soulbound = true + #Shadow Step is only active while sneaking [false/true|default:false] + nerf_shadow_step = false #Enables the enchantment Magic Siphon [false/true|default:true] enable_enchantment_magic_siphon = true @@ -34,46 +34,46 @@ #Maximum uses of a tablet [1..20|default:10] #Range: 1 ~ 20 tablet_max_use = 10 - #Sets the decorative graves unbreakable [false/true|default:false] - unbreakable_decorative_grave = false #The cooldown in hours to pray with the Ânkh [1..10|default:3] #Range: 1 ~ 10 cooldown_to_pray = 3 + #Sets the decorative graves unbreakable [false/true|default:false] + unbreakable_decorative_grave = false #Allows to disable some magic items [allowedMagicItems] - #Voodoo Poppet [false/true|default:true] - allow_voodoo_poppet = true #Book of Disenchantment [false/true|default:true] allow_book_of_disenchantment = true + #Scroll of Feather Fall [false/true|default:true] + allow_scroll_of_feather_fall = true + #Voodoo Poppet [false/true|default:true] + allow_voodoo_poppet = true + #Scroll of Unstable Intangibleness [false/true|default:true] + allow_scroll_of_unstable_intangibleness = true + #Dust of Vanishing [false/true|default:true] + allow_dust_of_vanishing = true + #Tablet of Cupidity [false/true|default:true] + allow_tablet_of_cupidity = true + #Scroll of Purification [false/true|default:true] + allow_scroll_of_purification = true + #Scroll of Reach [false/true|default:true] + allow_scroll_of_reach = true #Scroll of Preservation [false/true|default:true] allow_scroll_of_preservation = true - #Grave's Key [false/true|default:true] - allow_grave_key = true - #Scroll of Knowledge [false/true|default:true] - allow_scroll_of_knowledge = true #Tablet of Recall [false/true|default:true] allow_tablet_of_recall = true - #Tablet of Home [false/true|default:true] - allow_tablet_of_home = true + #Scroll of Knowledge [false/true|default:true] + allow_scroll_of_knowledge = true #Tablet of Assistance [false/true|default:true] allow_tablet_of_assistance = true - #Tablet of Cupidity [false/true|default:true] - allow_tablet_of_cupidity = true - #Scroll of Unstable Intangibleness [false/true|default:true] - allow_scroll_of_unstable_intangibleness = true - #Scroll of Feather Fall [false/true|default:true] - allow_scroll_of_feather_fall = true - #Scroll of Purification [false/true|default:true] - allow_scroll_of_purification = true + #Grave's Key [false/true|default:true] + allow_grave_key = true #Scroll of True Sight [false/true|default:true] allow_scroll_of_true_sight = true #Lost Tablet [false/true|default:true] allow_lost_tablet = true - #Scroll of Reach [false/true|default:true] - allow_scroll_of_reach = true - #Dust of Vanishing [false/true|default:true] - allow_dust_of_vanishing = true + #Tablet of Home [false/true|default:true] + allow_tablet_of_home = true #Allows to change the chance to drop some items [loot] diff --git a/config/vehicle-client.toml b/config/vehicle-client.toml index b222482..6f9a7bd 100644 --- a/config/vehicle-client.toml +++ b/config/vehicle-client.toml @@ -9,13 +9,19 @@ #Configuration options for debugging vehicles [client.debug] + #If true, renders lines to help visualise steering direction and target position. + renderSteeringDebug = false #If true, renders an outline of all the elements on a vehicle's model. Useful for debugging interactions. renderOutlines = false #If true, the raytracer will be reloaded each tick. reloadRaytracerEachTick = false + #If true, the vehicle properties will be reloaded each tick. + reloadVehiclePropertiesEachTick = false #Configuration for display related options [client.display] + #If true, automatically rotates the camera when turning in a vehicle + rotateCameraWithVehicle = true #If true, automatically switches to third person when mounting vehicles autoPerspective = true #If true, displays a speedometer on the HUD when driving a vehicle diff --git a/mods/EnchantmentDescriptions-1.15.2-2.0.1.jar b/mods/EnchantmentDescriptions-1.15.2-2.0.1.jar new file mode 100644 index 0000000..47a40de Binary files /dev/null and b/mods/EnchantmentDescriptions-1.15.2-2.0.1.jar differ diff --git a/mods/Glasshole-1.0.2.jar b/mods/Glasshole-1.0.2.jar new file mode 100644 index 0000000..4bc2fad Binary files /dev/null and b/mods/Glasshole-1.0.2.jar differ diff --git a/mods/JAOPCA-1.15.2-3.0.0.19.jar b/mods/JAOPCA-1.15.2-3.0.0.21.jar similarity index 58% rename from mods/JAOPCA-1.15.2-3.0.0.19.jar rename to mods/JAOPCA-1.15.2-3.0.0.21.jar index 30b0536..c311744 100644 Binary files a/mods/JAOPCA-1.15.2-3.0.0.19.jar and b/mods/JAOPCA-1.15.2-3.0.0.21.jar differ diff --git a/mods/KleeSlabs_1.15.2-8.0.0.jar b/mods/KleeSlabs_1.15.2-8.0.0.jar deleted file mode 100644 index 17dac73..0000000 Binary files a/mods/KleeSlabs_1.15.2-8.0.0.jar and /dev/null differ diff --git a/mods/Lollipop-1.15.2-1.0.7.jar b/mods/Lollipop-1.15.2-1.0.9.jar similarity index 58% rename from mods/Lollipop-1.15.2-1.0.7.jar rename to mods/Lollipop-1.15.2-1.0.9.jar index a9c29da..b58b202 100644 Binary files a/mods/Lollipop-1.15.2-1.0.7.jar and b/mods/Lollipop-1.15.2-1.0.9.jar differ diff --git a/mods/Mekanism-1.15.2-9.9.11.403.jar b/mods/Mekanism-1.15.2-9.9.15.407.jar similarity index 56% rename from mods/Mekanism-1.15.2-9.9.11.403.jar rename to mods/Mekanism-1.15.2-9.9.15.407.jar index c3a0ab4..e6ec66f 100644 Binary files a/mods/Mekanism-1.15.2-9.9.11.403.jar and b/mods/Mekanism-1.15.2-9.9.15.407.jar differ diff --git a/mods/MekanismGenerators-1.15.2-9.9.11.403.jar b/mods/MekanismGenerators-1.15.2-9.9.11.403.jar deleted file mode 100644 index ecd04b9..0000000 Binary files a/mods/MekanismGenerators-1.15.2-9.9.11.403.jar and /dev/null differ diff --git a/mods/MekanismGenerators-1.15.2-9.9.15.407.jar b/mods/MekanismGenerators-1.15.2-9.9.15.407.jar new file mode 100644 index 0000000..bcd9fa3 Binary files /dev/null and b/mods/MekanismGenerators-1.15.2-9.9.15.407.jar differ diff --git a/mods/MekanismTools-1.15.2-9.9.11.403.jar b/mods/MekanismTools-1.15.2-9.9.11.403.jar deleted file mode 100644 index 50b2d47..0000000 Binary files a/mods/MekanismTools-1.15.2-9.9.11.403.jar and /dev/null differ diff --git a/mods/MekanismTools-1.15.2-9.9.15.407.jar b/mods/MekanismTools-1.15.2-9.9.15.407.jar new file mode 100644 index 0000000..b093332 Binary files /dev/null and b/mods/MekanismTools-1.15.2-9.9.15.407.jar differ diff --git a/mods/NaturesCompass-1.15.2-1.8.4.jar b/mods/NaturesCompass-1.15.2-1.8.5.jar similarity index 86% rename from mods/NaturesCompass-1.15.2-1.8.4.jar rename to mods/NaturesCompass-1.15.2-1.8.5.jar index 6aa0583..9e63e30 100644 Binary files a/mods/NaturesCompass-1.15.2-1.8.4.jar and b/mods/NaturesCompass-1.15.2-1.8.5.jar differ diff --git a/mods/PackMenu-1.15.2-1.2.3.jar b/mods/PackMenu-1.15.2-1.2.4.jar similarity index 88% rename from mods/PackMenu-1.15.2-1.2.3.jar rename to mods/PackMenu-1.15.2-1.2.4.jar index 672991a..1e7528f 100644 Binary files a/mods/PackMenu-1.15.2-1.2.3.jar and b/mods/PackMenu-1.15.2-1.2.4.jar differ diff --git a/mods/Patchouli-1.15.2-1.2-27.jar b/mods/Patchouli-1.15.2-1.2-28.jar similarity index 80% rename from mods/Patchouli-1.15.2-1.2-27.jar rename to mods/Patchouli-1.15.2-1.2-28.jar index ed504a0..e9dc645 100644 Binary files a/mods/Patchouli-1.15.2-1.2-27.jar and b/mods/Patchouli-1.15.2-1.2-28.jar differ diff --git a/mods/Powah-1.15.2-1.1.5.jar b/mods/Powah-1.15.2-1.1.7.jar similarity index 72% rename from mods/Powah-1.15.2-1.1.5.jar rename to mods/Powah-1.15.2-1.1.7.jar index ee7f5c9..1f1eb50 100644 Binary files a/mods/Powah-1.15.2-1.1.5.jar and b/mods/Powah-1.15.2-1.1.7.jar differ diff --git a/mods/ResourcefulTools-1.15.2-1.1.18.jar b/mods/ResourcefulTools-1.15.2-1.1.18.jar deleted file mode 100644 index 9503261..0000000 Binary files a/mods/ResourcefulTools-1.15.2-1.1.18.jar and /dev/null differ diff --git a/mods/ResourcefulTools-1.15.2-1.1.20.jar b/mods/ResourcefulTools-1.15.2-1.1.20.jar new file mode 100644 index 0000000..40677bf Binary files /dev/null and b/mods/ResourcefulTools-1.15.2-1.1.20.jar differ diff --git a/mods/SilentGear-1.15.2-1.5.2+77.jar b/mods/SilentGear-1.15.2-1.5.3+78.jar similarity index 73% rename from mods/SilentGear-1.15.2-1.5.2+77.jar rename to mods/SilentGear-1.15.2-1.5.3+78.jar index 27cfc29..684997d 100644 Binary files a/mods/SilentGear-1.15.2-1.5.2+77.jar and b/mods/SilentGear-1.15.2-1.5.3+78.jar differ diff --git a/mods/TheVeggieWay-1.15.2-2.1.19.jar b/mods/TheVeggieWay-1.15.2-2.1.20.jar similarity index 67% rename from mods/TheVeggieWay-1.15.2-2.1.19.jar rename to mods/TheVeggieWay-1.15.2-2.1.20.jar index dbaf498..26c5499 100644 Binary files a/mods/TheVeggieWay-1.15.2-2.1.19.jar and b/mods/TheVeggieWay-1.15.2-2.1.20.jar differ diff --git a/mods/WaterStrainer-1.15.1-8.0.0.jar b/mods/WaterStrainer-1.15.2-9.0.0.jar similarity index 83% rename from mods/WaterStrainer-1.15.1-8.0.0.jar rename to mods/WaterStrainer-1.15.2-9.0.0.jar index 07edcb2..4dec269 100644 Binary files a/mods/WaterStrainer-1.15.1-8.0.0.jar and b/mods/WaterStrainer-1.15.2-9.0.0.jar differ diff --git a/mods/Xaeros_Minimap_20.4.0.1_Forge_1.15.2.jar b/mods/Xaeros_Minimap_20.5.0_Forge_1.15.2.jar similarity index 83% rename from mods/Xaeros_Minimap_20.4.0.1_Forge_1.15.2.jar rename to mods/Xaeros_Minimap_20.5.0_Forge_1.15.2.jar index 1fa75bf..f8db27f 100644 Binary files a/mods/Xaeros_Minimap_20.4.0.1_Forge_1.15.2.jar and b/mods/Xaeros_Minimap_20.5.0_Forge_1.15.2.jar differ diff --git a/mods/bigbuckets-1.1.0.jar b/mods/bigbuckets-1.1.0.jar new file mode 100644 index 0000000..15ab976 Binary files /dev/null and b/mods/bigbuckets-1.1.0.jar differ diff --git a/mods/caelus-FORGE-1.15.2-2.0-beta1.jar b/mods/caelus-FORGE-1.15.2-2.0-beta1.jar new file mode 100644 index 0000000..cf4f566 Binary files /dev/null and b/mods/caelus-FORGE-1.15.2-2.0-beta1.jar differ diff --git a/mods/corail_woodcutter-1.1.1-1.15.2.jar b/mods/corail_woodcutter-1.1.1-1.15.2.jar new file mode 100644 index 0000000..f60d71a Binary files /dev/null and b/mods/corail_woodcutter-1.1.1-1.15.2.jar differ diff --git a/mods/curios-FORGE-1.15.2-2.0.jar b/mods/curios-FORGE-1.15.2-2.0.jar new file mode 100644 index 0000000..10e6f7f Binary files /dev/null and b/mods/curios-FORGE-1.15.2-2.0.jar differ diff --git a/mods/curiouselytra-FORGE-1.15.2-2.0.jar b/mods/curiouselytra-FORGE-1.15.2-2.0.jar new file mode 100644 index 0000000..864670f Binary files /dev/null and b/mods/curiouselytra-FORGE-1.15.2-2.0.jar differ diff --git a/mods/curiousshulkerboxes-FORGE-1.15.2-2.0.jar b/mods/curiousshulkerboxes-FORGE-1.15.2-2.0.jar new file mode 100644 index 0000000..01dc1a0 Binary files /dev/null and b/mods/curiousshulkerboxes-FORGE-1.15.2-2.0.jar differ diff --git a/mods/dimensionalworld-1.0.0.jar b/mods/dimensionalworld-1.0.0.jar new file mode 100644 index 0000000..94155f3 Binary files /dev/null and b/mods/dimensionalworld-1.0.0.jar differ diff --git a/mods/dynviewdist-1.3.jar b/mods/dynviewdist-1.3.jar new file mode 100644 index 0000000..bd3d503 Binary files /dev/null and b/mods/dynviewdist-1.3.jar differ diff --git a/mods/enchantability-5.2.jar b/mods/enchantability-5.2.jar new file mode 100644 index 0000000..7843946 Binary files /dev/null and b/mods/enchantability-5.2.jar differ diff --git a/mods/engineersdecor-1.15.2-1.0.19-b4.jar b/mods/engineersdecor-1.15.2-1.0.19-b5.jar similarity index 71% rename from mods/engineersdecor-1.15.2-1.0.19-b4.jar rename to mods/engineersdecor-1.15.2-1.0.19-b5.jar index 3d49f93..c18960e 100644 Binary files a/mods/engineersdecor-1.15.2-1.0.19-b4.jar and b/mods/engineersdecor-1.15.2-1.0.19-b5.jar differ diff --git a/mods/engineerstools-1.15.2-1.0.6-b2.jar b/mods/engineerstools-1.15.2-1.0.6.jar similarity index 68% rename from mods/engineerstools-1.15.2-1.0.6-b2.jar rename to mods/engineerstools-1.15.2-1.0.6.jar index 9b0aac3..1309e77 100644 Binary files a/mods/engineerstools-1.15.2-1.0.6-b2.jar and b/mods/engineerstools-1.15.2-1.0.6.jar differ diff --git a/mods/mcw-bridges-1.0.3-mc1.15.2.jar b/mods/mcw-bridges-1.0.3-mc1.15.2.jar deleted file mode 100644 index b707c4f..0000000 Binary files a/mods/mcw-bridges-1.0.3-mc1.15.2.jar and /dev/null differ diff --git a/mods/mcw-bridges-1.0.4fix-mc1.15.2.jar b/mods/mcw-bridges-1.0.4fix-mc1.15.2.jar new file mode 100644 index 0000000..3115125 Binary files /dev/null and b/mods/mcw-bridges-1.0.4fix-mc1.15.2.jar differ diff --git a/mods/mininggadgets-1.3.0.jar b/mods/mininggadgets-1.3.0.jar new file mode 100644 index 0000000..8fff35d Binary files /dev/null and b/mods/mininggadgets-1.3.0.jar differ diff --git a/mods/tanknull-1.7.jar b/mods/tanknull-1.8.jar similarity index 65% rename from mods/tanknull-1.7.jar rename to mods/tanknull-1.8.jar index 96d2a57..3136637 100644 Binary files a/mods/tanknull-1.7.jar and b/mods/tanknull-1.8.jar differ diff --git a/mods/u_team_core-1.15.2-2.10.6.155.jar b/mods/u_team_core-1.15.2-2.11.0.156.jar similarity index 80% rename from mods/u_team_core-1.15.2-2.10.6.155.jar rename to mods/u_team_core-1.15.2-2.11.0.156.jar index b2c91ef..3b3d2d0 100644 Binary files a/mods/u_team_core-1.15.2-2.10.6.155.jar and b/mods/u_team_core-1.15.2-2.11.0.156.jar differ diff --git a/mods/vehicle-mod-0.42.7-1.15.2.jar b/mods/vehicle-mod-0.43.0-1.15.2.jar similarity index 77% rename from mods/vehicle-mod-0.42.7-1.15.2.jar rename to mods/vehicle-mod-0.43.0-1.15.2.jar index e56b41f..5cb64dc 100644 Binary files a/mods/vehicle-mod-0.42.7-1.15.2.jar and b/mods/vehicle-mod-0.43.0-1.15.2.jar differ diff --git a/scripts/alchemistry_extra_recipes.zs b/scripts/alchemistry_extra_recipes.zs new file mode 100644 index 0000000..48b7c29 --- /dev/null +++ b/scripts/alchemistry_extra_recipes.zs @@ -0,0 +1,3 @@ +//PVC to tinydryrubber +craftingTable.addShapeless("pvc_2_tinydryrubber", * 1, + [, ], null); diff --git a/scripts/ciprania_scripts.backup b/scripts/ciprania_scripts.backup deleted file mode 100644 index bd03832..0000000 --- a/scripts/ciprania_scripts.backup +++ /dev/null @@ -1,166 +0,0 @@ -//Cheaper concrete from Mallrat -import crafttweaker.api.BracketHandlers; - -val COLORS = ["white","orange","magenta","light_blue","yellow","lime","pink","gray","light_gray","cyan","purple","blue","brown","green","red","black"]; - -for color in COLORS { - modifyConcreteRecipes(color); -} - -function modifyConcreteRecipes(color as string) as void { - - val powder = BracketHandlers.getItem("minecraft:" + color + "_concrete_powder"); - val block = BracketHandlers.getItem("minecraft:" + color + "_concrete"); - val dye = BracketHandlers.getTag("forge:dyes/" + color); - - craftingTable.removeRecipe(powder); - - craftingTable.addShapeless( - color + "_concrete_powder", - powder * 32, - [dye, , , , , , ,,] - ); - - craftingTable.addShapeless( - color + "_concrete_clay_block", - block * 32, - [powder * 4, powder * 4, powder * 4, powder * 4,powder * 4, powder * 4, powder * 4, powder * 4, ] - ); - - craftingTable.addShapeless( - color + "_concrete_clay_ball", - block * 8, - [powder, powder, powder, powder,powder, powder, powder, powder, ] - ); -} - -//Rotten Flesh to Leather -craftingTable.addShaped("flesh_2_leather", , - [[, ,], - [, , ], - [, , ]]); - -//Hopper Log Alternative -craftingTable.addShaped("hopper_tweak", , - [[, , ], - [, , ], - [, , ]]); - -//8 Logs to 4 Chests -craftingTable.addShaped("logs_2_chests", * 4, - [[, , ], - [, , ], - [, , ]]); - -//2 logs to 2 sticks -craftingTable.addShapeless("logs_2_sticks", * 16, - [, ], null); - -//Wheat to Seeds -craftingTable.addShapeless("wheat_2_seeds", , - [], null); - -//Clay Blocks to Clay Ball -craftingTable.addShapeless("clay_tweak", * 4, - [], null); - -//Chest Conversion -craftingTable.addShapeless("chest_conversion", , - [], null); - -//Tag Vanilla Fruits -.addItems(, , , ); - -//Tag Fruit Tree Fruits (Removed due to mod being removed. Keeping here in case it comes back in the future.) -//.addItems(, , , , , , ); - -//Tag Salt from XLMods -.addItems(); -.addItems(); -.addItems(); - -//Tag Salt from Alchemistry -.addItems(); -.addItems(); -.addItems(); - -//Remove salt tag from saltpeter -.removeItems(); -.removeItems(); -.removeItems(); - -//Rice Paper -craftingTable.addShapeless("paper", * 3, - [, , ], null); - -//XLFood salty food recipes with Forge Salt -craftingTable.removeRecipe(); - craftingTable.addShapeless("beef_jerky", * 4, - [, , ], null); -craftingTable.removeRecipe(); - craftingTable.addShapeless("salty_chips", * 1, - [, ], null); -craftingTable.removeRecipe(); - craftingTable.addShapeless("ham", * 4, - [, , ], null); -craftingTable.removeRecipe(); - craftingTable.addShapeless("chips", * 1, - [, ], null); -craftingTable.removeRecipe(); - craftingTable.addShaped("butter", * 2, - [[, , ], - [, , ], - [, , ]]); - -//Campfire Torches provided by TheDarkPreacher and mallrat208 -campfire.removeRecipe(); -campfire.addRecipe("campfire_torches", * 2, - , 1.0, 100); - -//Alternate black dye recipes from TheDarkPreacher -craftingTable.addShapeless("crushedcoaltodye", , - []); -craftingTable.addShapeless("crushedcharcoaltodye",, - []); -craftingTable.addShapeless("coaltodyefor", , - []); - -//Drying rack recipe for conflict from TheDarkPreacher -craftingTable.removeRecipe(); - craftingTable.addShaped("odryingrack", , - [[, , ]]); -craftingTable.removeRecipe(); - craftingTable.addShaped("bdryingrack", , - [[, , ]]); -craftingTable.removeRecipe(); - craftingTable.addShaped("sdryingrack", , - [[, , ]]); -craftingTable.removeRecipe(); - craftingTable.addShaped("jdryingrack", , - [[, , ]]); -craftingTable.removeRecipe(); - craftingTable.addShaped("ddryingrack", , - [[, , ]]); -craftingTable.removeRecipe(); - craftingTable.addShaped("adryingrack", , - [[, , ]]); - -//Pile Of Bricks from TheDarkPreacher -craftingTable.removeRecipe(); - craftingTable.addShaped("compressedbrick", , - [[, ], - [, ]]); - craftingTable.addShapeless("uncompressedbrick", * 4, - []); - -//Wisp VooDoo from TheDarkPreacher -craftingTable.addShaped("waterwisp", , - [[, , ]]); -craftingTable.addShaped("chaoswisp", , - [[, , ]]); -craftingTable.addShaped("firewisp", , - [[, , ]]); -craftingTable.addShaped("icewisp", , - [[, , ]]); -craftingTable.addShaped("lightningwisp", , - [[, , ]]); diff --git a/scripts/multi_salt_tags.zs b/scripts/multi_salt_tags.zs deleted file mode 100644 index 8732114..0000000 --- a/scripts/multi_salt_tags.zs +++ /dev/null @@ -1,14 +0,0 @@ -//Tag Salt from XLMods -.addItems(); -.addItems(); -.addItems(); - -//Tag Salt from Alchemistry -.addItems(); -.addItems(); -.addItems(); - -//Remove salt tag from saltpeter -.removeItems(); -.removeItems(); -.removeItems(); diff --git a/scripts/multi_salt_tags_and_recipes.zs b/scripts/multi_salt_tags_and_recipes.zs index 635f1a9..0c3265d 100644 --- a/scripts/multi_salt_tags_and_recipes.zs +++ b/scripts/multi_salt_tags_and_recipes.zs @@ -1,36 +1,14 @@ //Remove xlfoods salt recipe from smoker smoker.removeRecipe(); -//Tag Salt from XLMods -.addItems(); -.addItems(); -.addItems(); - -//Tag Salt from Alchemistry -.addItems(); -.addItems(); -.addItems(); - //Remove salt tag from saltpeter .removeItems(); .removeItems(); .removeItems(); -//XLFood salty food recipes with Forge Salt -craftingTable.removeRecipe(); - craftingTable.addShapeless("beef_jerky", * 4, - [, , ], null); -craftingTable.removeRecipe(); - craftingTable.addShapeless("salty_chips", * 1, - [, ], null); -craftingTable.removeRecipe(); - craftingTable.addShapeless("ham", * 4, - [, , ], null); -craftingTable.removeRecipe(); - craftingTable.addShapeless("chips", * 1, - [, ], null); -craftingTable.removeRecipe(); - craftingTable.addShaped("butter", * 2, - [[, , ], - [, , ], - [, , ]]); +//Convert alchemistry and mekanism salt to xlfoodmod salt +craftingTable.addShapeless("mineral_salt_conversion", , + [], null); + +craftingTable.addShapeless("mek_salt_conversion", , + [], null); diff --git a/scripts/multi_slime_from_food.zs b/scripts/multi_slime_from_food.zs index 5fe425d..d838dc4 100644 --- a/scripts/multi_slime_from_food.zs +++ b/scripts/multi_slime_from_food.zs @@ -1,7 +1,18 @@ //Add protoslime tag -.createItemTag(); -.addItems([,,,]); +//.addItems(); +//.addItems(); +//.addItems(); +//.addItems(); -//craft slime using 4 protosliime ingredients -craftingTable.addShapeless("slime_from_food", , - [, , , ],null); +//craft slime using food ingredients +craftingTable.addShapeless("slime_from_rice", , + [, , , ],null); + +craftingTable.addShapeless("slime_from_tomato", , + [, , , ],null); + +craftingTable.addShapeless("slime_from_egg", , + [, , , ],null); + +craftingTable.addShapeless("slime_from_jellyfish", , + [, , , ],null); diff --git a/scripts/powah_tags_and_conversions.zs b/scripts/powah_tags_and_conversions.zs new file mode 100644 index 0000000..a80b237 --- /dev/null +++ b/scripts/powah_tags_and_conversions.zs @@ -0,0 +1,11 @@ +//Tag Ores from Powah +.addItems(); +.addItems(); +.addItems(); + +//Convert silent's uranium to powah uraninite and back +craftingTable.addShapeless("uranium_conversion", * 2, + [, ], null); + +craftingTable.addShapeless("uraninite_conversion", , + [], null); diff --git a/scripts/silentmech_alternate_recipes.zs b/scripts/silentmech_alternate_recipes.zs new file mode 100644 index 0000000..701354e --- /dev/null +++ b/scripts/silentmech_alternate_recipes.zs @@ -0,0 +1,6 @@ +//Alternate recipe for upgrade case + +craftingTable.addShaped("if_plastic_upgrade_case", * 2, + [[, ,], + [, , ], + [, , ]]);