Skip to content

Commit

Permalink
updated the modpack
Browse files Browse the repository at this point in the history
  • Loading branch information
variousauthors committed May 22, 2021
1 parent 7faa092 commit 7884b65
Show file tree
Hide file tree
Showing 71 changed files with 47,430 additions and 44,194 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased

### Changes
- upgrade bewitchment from 0.21.10 to 0.21.11

## [0.7.1] - 2021-03-12

### Changes
Expand Down
Binary file added modpack/bin/modpack.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion modpack/config/AppliedEnergistics2/CustomRecipes.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Configuration file

cache {
S:digest=eae8711eb5121d41252bb0bed04be245
S:digest=e71f24a87db5c19486420a71dceee0c9

# Caching can save processing time, if there are a lot of items. [default: true]
B:enableCache=true
Expand Down
2 changes: 1 addition & 1 deletion modpack/config/AppliedEnergistics2/VersionChecker.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
cache {
# Waits as many hours, until it checks again. [range: 0 ~ 168, default: 24]
I:interval=24
S:lastCheck=1602212740002
S:lastCheck=1609873159943
}


Expand Down
1,630 changes: 916 additions & 714 deletions modpack/config/AppliedEnergistics2/items.csv

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions modpack/config/BlockDrops/blockdrops.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22338,5 +22338,20 @@
"1pair0": "{\n \"left\": 1,\n \"right\": 1\n}",
"2pair0": "{\n \"left\": 1,\n \"right\": 1\n}",
"3pair0": "{\n \"left\": 1,\n \"right\": 1\n}"
},
{
"name": "gardenstuff:stone_block",
"meta": 0,
"length": 1,
"name0": "thermalfoundation:storage_resource",
"meta0": 0,
"0chance0": 100.0,
"1chance0": 100.0,
"2chance0": 100.0,
"3chance0": 100.0,
"0pair0": "{\n \"left\": 1,\n \"right\": 1\n}",
"1pair0": "{\n \"left\": 1,\n \"right\": 1\n}",
"2pair0": "{\n \"left\": 1,\n \"right\": 1\n}",
"3pair0": "{\n \"left\": 1,\n \"right\": 1\n}"
}
]
16 changes: 16 additions & 0 deletions modpack/config/BlockDrops/modVersions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"astralsorcery": "1.10.27",
"enderiointegrationforestry": "5.2.59",
"quarryplus": "12.4.5",
"jaff": "1.7_for_1.12",
"rustichromia": "0.9",
"teastory": "3.3.3-B33.418-1.12.2",
"animania": "1.7.3",
"rusticthaumaturgy": "4.4a",
Expand All @@ -13,6 +15,7 @@
"osv": "5.5",
"growthcraft_bamboo": "4.1.2",
"netherchest": "1.1.1",
"thermalinnovation": "0.3.6",
"craftstudioapi": "1.0.0",
"modnametooltip": "1.10.1",
"endercore": "1.12.2-0.5.76",
Expand All @@ -21,15 +24,18 @@
"ctm": "MC1.12.2-1.0.1.30",
"auracontrol": "1.12.2-1.0.2",
"bewitchment": "0.21.10",
"preston": "0.3.5",
"forgelin": "1.8.4",
"improvedbackpacks": "1.12.2-1.5.0.0",
"familiarfauna": "1.0.11",
"itemzoom": "1.11",
"wumpleutil": "2.12.9",
"cofhworld": "1.3.1",
"waddles": "0.6.0",
"waila": "1.8.26",
"mekanismgenerators": "1.12.2-9.8.3.390",
"enderioconduitsrefinedstorage": "5.2.59",
"redstonearsenal": "2.6.6",
"carryon": "1.12.3",
"jeresources": "0.9.2.60",
"mysticalmechanics": "0.12",
Expand All @@ -46,8 +52,10 @@
"enderiomachines": "5.2.59",
"jehc": "1.7.0",
"biomesoplenty": "7.0.1.2441",
"mtlib": "3.0.6",
"redstoneflux": "2.1.0",
"controlledburn": "1.12.2.021",
"modtweaker": "4.0.18",
"botania": "r1.10-363",
"projectred-core": "4.9.4.120",
"patchouli": "1.0-20",
Expand All @@ -70,8 +78,10 @@
"codechickenlib": "3.2.3.358",
"fastleafdecay": "v14",
"ctgui": "1.0.0",
"gardenstuff": "1.12-2.1.1",
"ikwid": "1.0.2",
"jei": "4.15.0.291",
"masonry_blocks": "1.0",
"bibliocraft": "2.4.5",
"mekanism": "1.12.2-9.8.3.390",
"thermalfoundation": "2.6.3",
Expand All @@ -80,7 +90,9 @@
"appliedenergistics2": "rv6-stable-7",
"comforts": "1.4.1.3",
"nuclearcraft": "2.18x",
"pantography": "2.0.2",
"naturescompass": "1.8.0",
"endertweaker": "1.2.0",
"sereneseasons": "1.2.18",
"storagenetwork": "1.7.10",
"enderiointegrationticlate": "5.2.59",
Expand All @@ -107,6 +119,7 @@
"tconstruct": "1.12.2-2.13.0.179",
"earthworks": "1.3.4.3",
"tcomplement": "1.12.2-0.4.3",
"tickcentral": "3.1",
"psi": "r1.1-77",
"thermaldynamics": "2.5.6",
"baubles": "1.5.2",
Expand All @@ -130,7 +143,10 @@
"sit": "v1.3",
"blockcraftery": "1.12.2-1.3.1",
"mrtjpcore": "2.1.4.43",
"noendermanpickup": "1.2",
"enderiobase": "5.2.59",
"wrcbe": "2.3.2",
"laggoggles": "FAT-1.12.2-4.9",
"wanionlib": "1.12.2-2.4",
"embers": "1.13-hotfix2",
"appleskin": "1.0.9",
Expand Down
2 changes: 1 addition & 1 deletion modpack/config/ChickenChunks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ players
#If set to false, players will have to be logged in for their chunkloaders to work.:Simply add <username>=<true|false>
allowoffline
{
DEFAULT=true
DEFAULT=false
OP=true
}

Expand Down
27 changes: 27 additions & 0 deletions modpack/config/LagGoggles-client.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Configuration file

general {
# If you're colorblind, change this to fit your needs.
# Available options:
# - GREEN_TO_RED
# - BLUE_TO_RED
# - GREEN_TO_BLUE
# Valid values:
# GREEN_TO_RED
# BLUE_TO_RED
# GREEN_TO_BLUE
S:COLORS=GREEN_TO_RED

# Define the number of microseconds at which an object is marked with a deep red colour for WORLD lag.
I:GRADIENT_MAXED_OUT_AT_MICROSECONDS=25

# Define the number of microseconds at which an object is marked with a deep red colour for FPS lag.
I:GRADIENT_MAXED_OUT_AT_NANOSECONDS_FPS=50000

# What is the minimum amount of microseconds required before an object is tracked in the client?
# This is only for WORLD lag.
# This also affects the analyze results window
I:MINIMUM_AMOUNT_OF_MICROSECONDS_THRESHOLD=1
}


41 changes: 41 additions & 0 deletions modpack/config/LagGoggles-server.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Configuration file

general {
# Allow normal users to see event subscribers?
B:ALLOW_NON_OPS_TO_SEE_EVENT_SUBSCRIBERS=false

# What is the maximum HORIZONTAL range in blocks normal users can get results for?
D:NON_OPS_MAX_HORIZONTAL_RANGE=50.0

# If normal users can start the profiler, what is the maximum time in seconds?
I:NON_OPS_MAX_PROFILE_TIME=20

# What is the maximum VERTICAL range in blocks normal users can get results for?
D:NON_OPS_MAX_VERTICAL_RANGE=20.0

# If normal users can start the profiler, what is the cool-down between requests in seconds?
I:NON_OPS_PROFILE_COOL_DOWN_SECONDS=120

# How often can normal users request the latest scan result in seconds?
I:NON_OPS_REQUEST_LAST_SCAN_DATA_TIMEOUT=30

# From where should we range-limit blocks vertically for normal users?
# This will override the MAX_VERTICAL_RANGE when the block is above this Y level
I:NON_OPS_WHITELIST_HEIGHT_ABOVE=64

# What's the permission level available to non-operators (Normal players)?
# Please note that this ONLY works on dedicated servers. If you're playing singleplayer or LAN, the FULL permission is used.
# Available permissions in ascending order are:
# 'NONE' No permissions are granted, all functionality is denied.
# 'GET' Allow getting the latest scan result, this will be stripped down to the player's surroundings
# 'START' Allow starting the profiler
# 'FULL' All permissions are granted, teleporting to entities, blocks
# Valid values:
# NONE
# GET
# START
# FULL
S:NON_OP_PERMISSION_LEVEL=START
}


9 changes: 9 additions & 0 deletions modpack/config/TickCentral/config.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# TickCentral config
# For you, this is only really needed to access debug settings
# As this is a library, there is generally no need to modify these settings
SHOW_FORCED_LOADING = false
DEBUG = false

# This library is capable of caching classes. This number is used to track if we should
# re-run the scanner. You can also manually trigger it by setting it to 0.
FILE_COUNT = 0
40 changes: 40 additions & 0 deletions modpack/config/WirelessRedstone.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#Wireless Redstone Chicken Bones Edition Configuration File:Deleting any element will restore it to it's default value

core
{
boltEffect
{
#Damages are in half hearts:If an entity gets knocked into another bolt it may suffer multiple hits
damage.entity=5
damage.player=3
}

jammer
{
#Delay in seconds before jamming the first time
blockdelay=10
entitydelay=5
#Jam an entity again after x seconds
entityretry=10
#Range In Blocks
range=10
#Timeout In Seconds:Applies to both blocks and players
timeout=60
}
}

addon.sniffer.gui
{
#Colours are in 0xAARRGGBB format:Alpha should be FF
colour.on=0xffff0000
colour.off=0xff700000
colour.jammed=0xff707070
colour.private.on=0xff40f000
colour.private.off=0xff40a000

border.on=0xffee0000
border.off=0xff500000
border.jammed=0xff505050
border.private.on=0xff20e000
border.private.off=0xff209000
}
2 changes: 1 addition & 1 deletion modpack/config/astralsorcery.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ general {

shooting_stars {
# Set to true to make shooting stars do a little explosion where they land [default: true]
B:doExplosion=true
B:doExplosion=false

# Set to false to disable shooting stars from spawning [default: true]
B:enabled=true
Expand Down
2 changes: 1 addition & 1 deletion modpack/config/astralsorcery/amulet_enchantments.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
##########################################################################################################

data {
# [default: [minecraft:protection:10], [minecraft:fire_protection:5], [minecraft:feather_falling:5], [minecraft:blast_protection:2], [minecraft:projectile_protection:5], [minecraft:respiration:2], [minecraft:aqua_affinity:2], [minecraft:thorns:1], [minecraft:depth_strider:2], [minecraft:frost_walker:2], [minecraft:sharpness:10], [minecraft:smite:5], [minecraft:bane_of_arthropods:5], [minecraft:knockback:5], [minecraft:fire_aspect:2], [minecraft:looting:2], [minecraft:sweeping:2], [minecraft:efficiency:10], [minecraft:silk_touch:1], [minecraft:unbreaking:5], [minecraft:fortune:2], [minecraft:power:10], [minecraft:punch:2], [minecraft:flame:2], [minecraft:infinity:1], [minecraft:luck_of_the_sea:2], [minecraft:lure:2], [minecraft:mending:2], [bewitchment:magic_protection:1], [bibliocraft:bibliocraft.deathcompassench:1], [bibliocraft:bibliocraft.readingench:5], [endercore:autosmelt:2], [endercore:xpboost:5], [enderio:repellent:1], [enderio:soulbound:1], [enderio:witherarrow:5], [enderio:witherweapon:5], [cofhcore:holding:5], [cofhcore:insight:5], [cofhcore:leech:5], [cofhcore:multishot:5], [cofhcore:smashing:2], [cofhcore:smelting:2], [cofhcore:soulbound:5], [cofhcore:vorpal:2], [astralsorcery:enchantment.as.nightvision:1], [astralsorcery:enchantment.as.smelting:1]]
# [default: [minecraft:protection:10], [minecraft:fire_protection:5], [minecraft:feather_falling:5], [minecraft:blast_protection:2], [minecraft:projectile_protection:5], [minecraft:respiration:2], [minecraft:aqua_affinity:2], [minecraft:thorns:1], [minecraft:depth_strider:2], [minecraft:frost_walker:2], [minecraft:sharpness:10], [minecraft:smite:5], [minecraft:bane_of_arthropods:5], [minecraft:knockback:5], [minecraft:fire_aspect:2], [minecraft:looting:2], [minecraft:sweeping:2], [minecraft:efficiency:10], [minecraft:silk_touch:1], [minecraft:unbreaking:5], [minecraft:fortune:2], [minecraft:power:10], [minecraft:punch:2], [minecraft:flame:2], [minecraft:infinity:1], [minecraft:luck_of_the_sea:2], [minecraft:lure:2], [minecraft:mending:2], [jaff:roasting:5], [bewitchment:magic_protection:1], [bibliocraft:bibliocraft.deathcompassench:1], [bibliocraft:bibliocraft.readingench:5], [endercore:autosmelt:2], [endercore:xpboost:5], [enderio:witherweapon:5], [enderio:repellent:1], [enderio:soulbound:1], [enderio:witherarrow:5], [cofhcore:holding:5], [cofhcore:insight:5], [cofhcore:leech:5], [cofhcore:multishot:5], [cofhcore:smashing:2], [cofhcore:smelting:2], [cofhcore:soulbound:5], [cofhcore:vorpal:2], [astralsorcery:enchantment.as.nightvision:1], [astralsorcery:enchantment.as.smelting:1]]
S:data <
minecraft:protection:10
minecraft:fire_protection:5
Expand Down
18 changes: 18 additions & 0 deletions modpack/config/chiselsandbits.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ crafting {
B:com.cactuscoffee.magic.block.BlockArcaneInfuser=true
B:com.cactuscoffee.magic.block.BlockMagiteOre=true
B:com.cactuscoffee.magic.block.BlockManaCrystalOre=true
B:com.jaquadro.minecraft.gardenstuff.block.BlockMetalMaterial=true
B:com.jaquadro.minecraft.gardenstuff.block.BlockStoneMaterial=true
B:com.jaquadro.minecraft.storagedrawers.block.BlockTrim=true
B:com.mrcrayfish.furniture.blocks.BlockInflatableCastle=true
B:com.pam.harvestcraft.blocks.blocks.BeeBlock=true
Expand Down Expand Up @@ -279,6 +281,7 @@ crafting {
B:org.dimdev.dimdoors.shared.blocks.BlockFabric=true
B:ovh.corail.tombstone.block.BlockDarkMarble=true
B:pl.asie.ucw.BlockUCWProxy=true
B:ru.liahim.masonry.content.MasonryBlock=true
B:ru.liahim.saltmod.block.SaltBlock=true
B:ru.liahim.saltmod.block.SaltDirt=true
B:ru.liahim.saltmod.block.SaltDirtLite=true
Expand All @@ -294,6 +297,8 @@ crafting {
B:rustic.common.blocks.BlockPillar=true
B:rustic.common.blocks.BlockPlanksRustic=true
B:rustic.common.blocks.crops.BlockLeavesApple=true
B:rustichromia.block.BlockSnakeHay=true
B:rustichromia.block.BlockThatchBarrel=true
B:shadows.fastbench.block.BlockFastBench=true
B:slimeknights.tconstruct.gadgets.block.BlockBrownstone=true
B:slimeknights.tconstruct.gadgets.block.BlockDriedClay=true
Expand Down Expand Up @@ -445,15 +450,23 @@ items {


"revertible states" {
B:"astralsorcery%3Ablockmarble?marbletype=bricks"=true
B:"astralsorcery%3Ablockmarble?marbletype=runed"=true
B:"biomesoplenty%3Agrass?snowy=false&variant=loamy"=true
B:"biomesoplenty%3Alog_0?axis=z&variant=cherry"=true
B:"botania%3Alivingrock?variant=brick"=true
B:"botania%3Alivingrock?variant=mossy_brick"=true
B:"chisel%3Acobblestone2?variation=0"=true
B:"chisel%3Acobblestone?variation=1"=true
B:"chisel%3Acobblestone?variation=3"=true
B:"chisel%3Alimestone1?variation=4"=true
B:"chisel%3Alimestone2?variation=7"=true
B:"chisel%3Alimestone?variation=10"=true
B:"chisel%3Alimestone?variation=9"=true
B:"chisel%3Asandstoneyellow?variation=1"=true
B:"chisel%3Astonebrick?variation=9"=true
B:"earthworks%3Ablock_wattle?"=true
B:"minecraft%3Acobblestone?"=true
B:"minecraft%3Adirt?snowy=false&variant=dirt"=true
B:"minecraft%3Agrass?snowy=false"=true
B:"minecraft%3Aleaves?check_decay=false&decayable=false&variant=oak"=true
Expand All @@ -462,6 +475,11 @@ items {
B:"minecraft%3Aplanks?variant=spruce"=true
B:"minecraft%3Astone?variant=granite"=true
B:"minecraft%3Astone?variant=stone"=true
B:"minecraft%3Astonebrick?variant=stonebrick"=true
B:"quark%3Acustom_bookshelf?variant=bookshelf_spruce"=true
B:"quark%3Avertical_planks?variant=vertical_spruce_planks"=true
B:"quark%3Aworld_stone_bricks?variant=stone_andesite_bricks"=true
B:"rustic%3Aslate_roof?"=true
}


Expand Down
Loading

0 comments on commit 7884b65

Please sign in to comment.