Skip to content

Commit

Permalink
Bump min CrT version to ensure we can properly process damage done wi…
Browse files Browse the repository at this point in the history
…th it and also re-enable farmer's delight in datagen. Also adjusted a few sawing recipes
  • Loading branch information
pupnewfster committed Jul 13, 2023
1 parent e8826e8 commit 77934d3
Show file tree
Hide file tree
Showing 50 changed files with 595 additions and 56 deletions.
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,7 @@ dependencies {
datagenMainRuntimeOnly fg.deobf("curse.maven:terrablender-563928:${terrablender_id}")
//TODO - 1.20: Switch back to datagenMainImplementation
datagenMainCompileOnly fg.deobf("curse.maven:biomes-youll-go-247560:${byg_id}")
//TODO - 1.20: Switch back to datagenMainImplementation
datagenMainCompileOnly fg.deobf("curse.maven:farmers-delight-398521:${farmers_delight_id}")
datagenMainImplementation fg.deobf("curse.maven:farmers-delight-398521:${farmers_delight_id}")
//TODO - 1.20: Switch back to datagenMainImplementation
datagenMainCompileOnly fg.deobf("curse.maven:i-like-wood-324164:${ilikewood_id}")
//TODO - 1.20: Switch back to datagenMainImplementation
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ quicktheories_version=0.26

#Mod dependencies
cc_tweaked_version=1.106.1
crafttweaker_version=14.0.6
crafttweaker_version=14.0.9
curios_version=5.2.0-beta.3+1.20.1
jade_api_id=4614156
jade_id=4614153
Expand All @@ -36,14 +36,15 @@ wildfire_gender_mod_id=4603538
wthit_version=8.1.1

#Mod dependency min version ranges
crafttweaker_version_range=[14.0.6,)
crafttweaker_version_range=[14.0.7,)
curios_version_range=[1.19-5.1.0.0,)
jei_version_range=[15.2.0.20,)

#Mod dependencies for recipes (only used by our data generators)
ae2_version=15.0.4-beta
biomesoplenty_api_id=4617261
biomesoplenty_id=4617259
farmers_delight_id=4638874
terrablender_id=4629880

#Outdated mod dependencies
Expand All @@ -56,7 +57,6 @@ oc2_id=3896581

#Outdated mod dependencies for recipes
byg_id=4027228
farmers_delight_id=4525646
ilikewood_id=4463114
ilikewood_bop_id=4068509
ilikewood_byg_id=4068511
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "mekanism:sawing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "biomesoplenty"
}
],
"input": {
"ingredient": {
"item": "biomesoplenty:dead_hanging_sign"
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:dead_planks"
},
"secondaryChance": 0.5,
"secondaryOutput": {
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "mekanism:sawing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "biomesoplenty"
}
],
"input": {
"ingredient": {
"item": "biomesoplenty:fir_hanging_sign"
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:fir_planks"
},
"secondaryChance": 0.5,
"secondaryOutput": {
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "mekanism:sawing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "biomesoplenty"
}
],
"input": {
"ingredient": {
"item": "biomesoplenty:hellbark_hanging_sign"
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:hellbark_planks"
},
"secondaryChance": 0.5,
"secondaryOutput": {
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "mekanism:sawing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "biomesoplenty"
}
],
"input": {
"ingredient": {
"item": "biomesoplenty:jacaranda_hanging_sign"
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:jacaranda_planks"
},
"secondaryChance": 0.5,
"secondaryOutput": {
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "mekanism:sawing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "biomesoplenty"
}
],
"input": {
"ingredient": {
"item": "biomesoplenty:magic_hanging_sign"
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:magic_planks"
},
"secondaryChance": 0.5,
"secondaryOutput": {
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "mekanism:sawing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "biomesoplenty"
}
],
"input": {
"ingredient": {
"item": "biomesoplenty:mahogany_hanging_sign"
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:mahogany_planks"
},
"secondaryChance": 0.5,
"secondaryOutput": {
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "mekanism:sawing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "biomesoplenty"
}
],
"input": {
"ingredient": {
"item": "biomesoplenty:palm_hanging_sign"
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:palm_planks"
},
"secondaryChance": 0.5,
"secondaryOutput": {
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "mekanism:sawing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "biomesoplenty"
}
],
"input": {
"ingredient": {
"item": "biomesoplenty:redwood_hanging_sign"
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:redwood_planks"
},
"secondaryChance": 0.5,
"secondaryOutput": {
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "mekanism:sawing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "biomesoplenty"
}
],
"input": {
"ingredient": {
"item": "biomesoplenty:umbran_hanging_sign"
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:umbran_planks"
},
"secondaryChance": 0.5,
"secondaryOutput": {
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "mekanism:sawing",
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "biomesoplenty"
}
],
"input": {
"ingredient": {
"item": "biomesoplenty:willow_hanging_sign"
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:willow_planks"
},
"secondaryChance": 0.5,
"secondaryOutput": {
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:dead_planks"
},
"secondaryChance": 0.25,
"secondaryOutput": {
"count": 2,
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:fir_planks"
},
"secondaryChance": 0.25,
"secondaryOutput": {
"count": 2,
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:hellbark_planks"
},
"secondaryChance": 0.25,
"secondaryOutput": {
"count": 2,
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:jacaranda_planks"
},
"secondaryChance": 0.25,
"secondaryOutput": {
"count": 2,
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:magic_planks"
},
"secondaryChance": 0.25,
"secondaryOutput": {
"count": 2,
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:mahogany_planks"
},
"secondaryChance": 0.25,
"secondaryOutput": {
"count": 2,
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:palm_planks"
},
"secondaryChance": 0.25,
"secondaryOutput": {
"count": 2,
"item": "mekanism:sawdust"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
}
},
"mainOutput": {
"count": 2,
"item": "biomesoplenty:redwood_planks"
},
"secondaryChance": 0.25,
"secondaryOutput": {
"count": 2,
"item": "mekanism:sawdust"
}
}
Loading

0 comments on commit 77934d3

Please sign in to comment.