Skip to content

Commit

Permalink
Merge pull request #9 from Filostorm/4.2
Browse files Browse the repository at this point in the history
4.2
  • Loading branch information
lawfulrocky authored Mar 6, 2021
2 parents b2e41be + 9d46c30 commit 55e7ce9
Show file tree
Hide file tree
Showing 1,616 changed files with 435,773 additions and 1,145 deletions.
2 changes: 1 addition & 1 deletion config/AppliedEnergistics2/CustomRecipes.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Configuration file

cache {
S:digest=01c59ceff844a3de35244a70fb56a187
S:digest=9e1a600b2c1b5e27326323ed149dc9e1

# 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 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=1614468402895
S:lastCheck=1614910122377
}


Expand Down
1,926 changes: 951 additions & 975 deletions config/AppliedEnergistics2/items.csv

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions config/BlockDrops/blockdrops.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23464,21 +23464,6 @@
"2pair0": "{\n \"left\": 1,\n \"right\": 1\n}",
"3pair0": "{\n \"left\": 1,\n \"right\": 1\n}"
},
{
"name": "embers:ore_quartz",
"meta": 0,
"length": 1,
"name0": "minecraft:quartz",
"meta0": 0,
"0chance0": 100.0,
"1chance0": 133.225,
"2chance0": 176.95,
"3chance0": 222.75,
"0pair0": "{\n \"left\": 1,\n \"right\": 1\n}",
"1pair0": "{\n \"left\": 1,\n \"right\": 2\n}",
"2pair0": "{\n \"left\": 1,\n \"right\": 3\n}",
"3pair0": "{\n \"left\": 1,\n \"right\": 4\n}"
},
{
"name": "fossil:cordaites_leaves",
"meta": 0,
Expand Down Expand Up @@ -26628,5 +26613,20 @@
"1pair0": "{\n \"left\": 0,\n \"right\": 1\n}",
"2pair0": "{\n \"left\": 0,\n \"right\": 1\n}",
"3pair0": "{\n \"left\": 0,\n \"right\": 1\n}"
},
{
"name": "embers:ore_quartz",
"meta": 0,
"length": 1,
"name0": "minecraft:quartz",
"meta0": 0,
"0chance0": 100.0,
"1chance0": 132.35,
"2chance0": 173.3,
"3chance0": 222.575,
"0pair0": "{\n \"left\": 1,\n \"right\": 1\n}",
"1pair0": "{\n \"left\": 1,\n \"right\": 2\n}",
"2pair0": "{\n \"left\": 1,\n \"right\": 3\n}",
"3pair0": "{\n \"left\": 1,\n \"right\": 4\n}"
}
]
15 changes: 6 additions & 9 deletions config/BlockDrops/modVersions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
"gottschcore": "1.14.0",
"enderutilities": "0.7.15",
"enderiointegrationtic": "5.2.66",
"worldedit": "6.1.10",
"cfm": "6.3.1",
"hardcoredarkness": "2.0",
"oredictinit": "1.12.2-2.2.1.71",
Expand Down Expand Up @@ -110,7 +111,8 @@
"mousetweaks": "2.10",
"immersiveengineering": "0.12-98",
"thermaldynamics": "2.5.6",
"entity_culling": "2.0.9",
"perfectspawn": "2.1",
"entity_culling": "3.0.1",
"applecore": "3.4.0",
"numina": "1.12.2-1.0.38",
"thaumicenergistics": "2.2.3",
Expand All @@ -131,22 +133,20 @@
"botania_tweaks_core": "-100",
"fastfurnace": "1.3.1",
"appleskin": "1.0.14",
"embers": "1.17",
"embers": "1.18",
"minecraftmultipartcbe": "2.6.2.83",
"enderioconduitsopencomputers": "5.2.66",
"tweakersconstruct": "1.12.2-1.5.6",
"inworldcrafting": "1.12.2-1.2.0",
"what": "0.2",
"moreplates": "5.5.2",
"base": "3.13.0",
"cyclopscore": "1.6.7",
"p455w0rdslib": "2.3.161",
"astralsorcery": "1.10.27",
"enderiointegrationforestry": "5.2.66",
"modularmachinery": "1.11.1",
"questbook": "3.1.1-1.12",
"universalmodifiers": "1.12.2-1.0.16.1",
"creativecoredummy": "1.0.0",
"rftools": "7.73",
"openmods": "0.12.2",
"jecalculation": "1.12.2-3.2.5",
Expand Down Expand Up @@ -179,7 +179,6 @@
"immersivetech": "1.3.10",
"thaumictinkerer": "1.12.2-5.0-620a0c5",
"tinkertoolleveling": "1.12.2-1.1.0.DEV.b23e769",
"ambientsounds": "3.0",
"crafttweakerjei": "2.0.3",
"enderiomachines": "5.2.66",
"morefurnaces": "1.10.5",
Expand Down Expand Up @@ -234,7 +233,7 @@
"foamfixcore": "7.7.4",
"omlib": "3.1.4-249",
"fossil": "8.0.5",
"packagedexcrafting": "1.12.2-1.0.1.1",
"packagedexcrafting": "1.12.2-1.0.2.3",
"bonsaitrees": "1.1.4",
"toastcontrol": "1.8.1",
"enderstorage": "2.4.6.137",
Expand All @@ -243,7 +242,6 @@
"bloodmagic": "1.12.2-2.4.3-105",
"thaumadditions": "12.6.6",
"brandonscore": "2.4.19",
"colossalchests": "1.7.3",
"mysticalagriculture": "1.7.5",
"openblocks": "1.8.1",
"craftingtweaks": "8.1.9",
Expand All @@ -253,8 +251,7 @@
"avaritia": "3.3.0",
"baubles": "1.5.2",
"arcanearchives": "0.2.0.25-mixins8",
"creativecore": "1.10.0",
"packagedauto": "1.12.2-1.0.3.13",
"packagedauto": "1.12.2-1.0.5.17",
"enderio": "5.2.66",
"justenoughpetroleum": "0.1",
"vanillafix": "1.0.10-150",
Expand Down
2 changes: 1 addition & 1 deletion config/InvTweaks.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Inventory Tweaks Configuration
#(Regarding shortcuts, all key names can be found at: http://legacy.lwjgl.org/javadoc/org/lwjgl/input/Keyboard.html)
#Sun Feb 28 00:55:31 EST 2021
#Fri Mar 05 20:22:00 EST 2021
enableMiddleClick=true
showChestButtons=true
enableSortingOnPickup=false
Expand Down
12 changes: 11 additions & 1 deletion config/JAOPCA.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6432,6 +6432,17 @@ obsidian {

# The module blacklist for this material. * will mean all modules.
S:moduleBlacklist <
coin
tinydust
smalldust
gear
plate
denseplate
stick
block
molten
dust
nugget
>

# The rarity of this material. Used to calculate default chances.
Expand Down Expand Up @@ -8966,7 +8977,6 @@ thaumium {
coin
tinydust
smalldust
gear
plate
denseplate
stick
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"path": "mod_agriculturalexpansion/plants/slime_sprout_plant.json",
"enabled": true,
"id": "agriculturalexpansion:slime_sprout_plant",
"plant_name": "Slime Crop",
"seed_name": "Slime Sprout",
"seed_items": [
{
"item": "agriculturalexpansion:slime_sprout",
"meta": 0,
"tags": "",
"ignoreMeta": false,
"ignoreTags": [
"*"
],
"useOreDict": false
}
],
"description": {
"translations": {},
"default": "Slime Sprout."
},
"growth_chance": 0.9,
"growth_bonus": 0.025,
"bonemeal": false,
"tier": 1,
"weedable": false,
"aggressive": false,
"spread_chance": 0.1,
"spawn_chance": 0.0,
"grass_drop_chance": 0.0,
"seed_drop_chance": 1.0,
"seed_drop_bonus": 0.0,
"products": {
"products": [
{
"min": 1,
"max": 5,
"chance": 0.9,
"required": true,
"item": "agriculturalexpansion:slime_essence",
"meta": 0,
"tags": "",
"ignoreMeta": false,
"ignoreTags": [],
"useOreDict": false
}
]
},
"requirement": {
"min_light": 10,
"max_light": 16,
"soils": [
"farmland_soil"
],
"conditions": []
},
"texture": {
"render_type": "cross",
"seed_texture": "agriculturalexpansion:items/slime_sprout",
"plant_textures": [
"agriculturalexpansion:blocks/crop0",
"agriculturalexpansion:blocks/crop1",
"agriculturalexpansion:blocks/crop2",
"agriculturalexpansion:blocks/crop3",
"agriculturalexpansion:blocks/crop4",
"agriculturalexpansion:blocks/crop5",
"agriculturalexpansion:blocks/slime_crop6",
"agriculturalexpansion:blocks/slime_crop7"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"path": "mod_agriculturalexpansion/plants/spider_sprout_plant.json",
"enabled": true,
"id": "agriculturalexpansion:spider_sprout_plant",
"plant_name": "Spider Crop",
"seed_name": "Spider Sprout",
"seed_items": [
{
"item": "agriculturalexpansion:spider_sprout",
"meta": 0,
"tags": "",
"ignoreMeta": false,
"ignoreTags": [
"*"
],
"useOreDict": false
}
],
"description": {
"translations": {},
"default": "Spider Sprout."
},
"growth_chance": 0.9,
"growth_bonus": 0.025,
"bonemeal": false,
"tier": 1,
"weedable": false,
"aggressive": false,
"spread_chance": 0.1,
"spawn_chance": 0.0,
"grass_drop_chance": 0.0,
"seed_drop_chance": 1.0,
"seed_drop_bonus": 0.0,
"products": {
"products": [
{
"min": 1,
"max": 5,
"chance": 0.9,
"required": true,
"item": "agriculturalexpansion:spider_essence",
"meta": 0,
"tags": "",
"ignoreMeta": false,
"ignoreTags": [],
"useOreDict": false
}
]
},
"requirement": {
"min_light": 10,
"max_light": 16,
"soils": [
"farmland_soil"
],
"conditions": []
},
"texture": {
"render_type": "cross",
"seed_texture": "agriculturalexpansion:items/spider_sprout",
"plant_textures": [
"agriculturalexpansion:blocks/crop0",
"agriculturalexpansion:blocks/crop1",
"agriculturalexpansion:blocks/crop2",
"agriculturalexpansion:blocks/crop3",
"agriculturalexpansion:blocks/crop4",
"agriculturalexpansion:blocks/crop5",
"agriculturalexpansion:blocks/spider_crop6",
"agriculturalexpansion:blocks/spider_crop7"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"path": "mod_agriculturalexpansion/plants/squid_sprout_plant.json",
"enabled": true,
"id": "agriculturalexpansion:squid_sprout_plant",
"plant_name": "Squid Crop",
"seed_name": "Squid Sprout",
"seed_items": [
{
"item": "agriculturalexpansion:squid_sprout",
"meta": 0,
"tags": "",
"ignoreMeta": false,
"ignoreTags": [
"*"
],
"useOreDict": false
}
],
"description": {
"translations": {},
"default": "Squid Sprout."
},
"growth_chance": 0.9,
"growth_bonus": 0.025,
"bonemeal": false,
"tier": 1,
"weedable": false,
"aggressive": false,
"spread_chance": 0.1,
"spawn_chance": 0.0,
"grass_drop_chance": 0.0,
"seed_drop_chance": 1.0,
"seed_drop_bonus": 0.0,
"products": {
"products": [
{
"min": 1,
"max": 5,
"chance": 0.9,
"required": true,
"item": "agriculturalexpansion:squid_essence",
"meta": 0,
"tags": "",
"ignoreMeta": false,
"ignoreTags": [],
"useOreDict": false
}
]
},
"requirement": {
"min_light": 10,
"max_light": 16,
"soils": [
"farmland_soil"
],
"conditions": []
},
"texture": {
"render_type": "cross",
"seed_texture": "agriculturalexpansion:items/squid_sprout",
"plant_textures": [
"agriculturalexpansion:blocks/crop0",
"agriculturalexpansion:blocks/crop1",
"agriculturalexpansion:blocks/crop2",
"agriculturalexpansion:blocks/crop3",
"agriculturalexpansion:blocks/crop4",
"agriculturalexpansion:blocks/crop5",
"agriculturalexpansion:blocks/squid_crop6",
"agriculturalexpansion:blocks/squid_crop7"
]
}
}
Loading

0 comments on commit 55e7ce9

Please sign in to comment.