1.14: Config skel ported (experimental), JEI integration ported (experimental, also addresses issue #38).
This commit is contained in:
parent
43156bb348
commit
a2e7fcac16
8 changed files with 172 additions and 33 deletions
|
@ -5,7 +5,6 @@
|
|||
#
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
itemGroup.tabengineersdecor=Engineer's Decor
|
||||
engineersdecor.config.title=Engineer's Decor Config
|
||||
engineersdecor.tooltip.hint.extended=§6[§9SHIFT§r More Info§6]§r
|
||||
engineersdecor.tooltip.hint.help=§6[§9CTRL-SHIFT§r Help§6]§r
|
||||
engineersdecor.tooltip.slabpickup.help=§rFast pickup by left-clicking while looking up/down and holding this slab.
|
||||
|
@ -182,6 +181,52 @@ tile.engineersdecor.halfslab_sheetmetal_gold.name=Gold Sheet Metal Slice
|
|||
tile.engineersdecor.halfslab_sheetmetal_gold.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices.
|
||||
tile.engineersdecor.halfslab_sheetmetal_aluminum.name=Aluminum Sheet Metal Slice
|
||||
tile.engineersdecor.halfslab_sheetmetal_aluminum.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices.
|
||||
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
engineersdecor.config.title=Engineer's Decor Config
|
||||
engineersdecor.config.pattern_excludes=Pattern excludes
|
||||
engineersdecor.config.pattern_includes=Pattern includes
|
||||
engineersdecor.config.without_clinker_bricks=Without clinker bricks
|
||||
engineersdecor.config.without_slag_bricks=Without slag bricks
|
||||
engineersdecor.config.without_rebar_concrete=Without rebar concrete
|
||||
engineersdecor.config.without_walls=Without walls
|
||||
engineersdecor.config.without_stairs=Without stairs
|
||||
engineersdecor.config.without_ie_concrete_wall=Without concrete wall
|
||||
engineersdecor.config.without_panzer_glass=Without panzer glass
|
||||
engineersdecor.config.without_crafting_table=Without crafting table
|
||||
engineersdecor.config.without_lab_furnace=Without lab furnace
|
||||
engineersdecor.config.without_electrical_furnace=Without electrical furnace
|
||||
engineersdecor.config.without_treated_wood_furniture=Without tr. wood furniture
|
||||
engineersdecor.config.without_windows=Without windows
|
||||
engineersdecor.config.without_light_sources=Without lights
|
||||
engineersdecor.config.without_ladders=Without ladders
|
||||
engineersdecor.config.without_chair_sitting=Without chair sitting
|
||||
engineersdecor.config.without_mob_chair_sitting=Without chair mob sitting
|
||||
engineersdecor.config.without_ladder_speed_boost=Without ladder speed boost
|
||||
engineersdecor.config.without_crafting_table_history=Without crafting table history
|
||||
engineersdecor.config.without_valves=Without valves
|
||||
engineersdecor.config.without_passive_fluid_accumulator=Without fluid accumulator
|
||||
engineersdecor.config.without_waste_incinerator=Without waste incinerator
|
||||
engineersdecor.config.without_sign_plates=Without signs
|
||||
engineersdecor.config.without_factory_dropper=Without factory dropper
|
||||
engineersdecor.config.without_slabs=Without slabs
|
||||
engineersdecor.config.without_halfslabs=Without slab slices
|
||||
engineersdecor.config.without_direct_slab_pickup=Without slab pickup
|
||||
engineersdecor.config.without_poles=Without poles
|
||||
engineersdecor.config.without_hsupports=Without h. supports
|
||||
engineersdecor.config.without_tooltips=Without tooltips
|
||||
engineersdecor.config.without_recipes=Without recipes
|
||||
engineersdecor.config.furnace_smelting_speed_percent=Furnace: Smelting speed %
|
||||
engineersdecor.config.furnace_fuel_efficiency_percent=Furnace: Fuel efficiency %
|
||||
engineersdecor.config.furnace_boost_energy_consumption=Furnace: Boost energy
|
||||
engineersdecor.config.chair_mob_sitting_probability_percent=Chairs: Sitting chance %
|
||||
engineersdecor.config.chair_mob_standup_probability_percent="Chairs: Stand up chance %"
|
||||
engineersdecor.config.with_crafting_quickmove_buttons=Crafting table: Move buttons
|
||||
engineersdecor.config.pipevalve_max_flowrate=Valves: Max flow rate
|
||||
engineersdecor.config.pipevalve_redstone_gain=Valves: Redstone slope
|
||||
engineersdecor.config.e_furnace_speed_percent=E-furnace: Smelting speed %
|
||||
engineersdecor.config.e_furnace_power_consumption=E-furnace: Power consumption
|
||||
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
# EOF
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
itemGroup.tabengineersdecor=Engineer's Decor
|
||||
engineersdecor.config.title=Engineer's Decor конфигурация
|
||||
engineersdecor.tooltip.hint.extended=§6[§9SHIFT§r Больше информации§6]§r
|
||||
engineersdecor.tooltip.hint.help=§6[§9CTRL-SHIFT§r Помощь§6]§r
|
||||
#engineersdecor.tooltip.slabpickup.help=§rFast pickup by left-clicking while looking up/down and holding this slab.
|
||||
|
@ -177,6 +176,52 @@ tile.engineersdecor.halfslab_sheetmetal_gold.name=Часть золотого л
|
|||
tile.engineersdecor.halfslab_sheetmetal_gold.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей.
|
||||
tile.engineersdecor.halfslab_sheetmetal_aluminum.name=Часть алюминиевого листового металла
|
||||
tile.engineersdecor.halfslab_sheetmetal_aluminum.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей.
|
||||
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
engineersdecor.config.title=Engineer's Decor конфигурация
|
||||
engineersdecor.config.pattern_excludes=Pattern excludes
|
||||
engineersdecor.config.pattern_includes=Pattern includes
|
||||
engineersdecor.config.without_clinker_bricks=Without clinker bricks
|
||||
engineersdecor.config.without_slag_bricks=Without slag bricks
|
||||
engineersdecor.config.without_rebar_concrete=Without rebar concrete
|
||||
engineersdecor.config.without_walls=Without walls
|
||||
engineersdecor.config.without_stairs=Without stairs
|
||||
engineersdecor.config.without_ie_concrete_wall=Without concrete wall
|
||||
engineersdecor.config.without_panzer_glass=Without panzer glass
|
||||
engineersdecor.config.without_crafting_table=Without crafting table
|
||||
engineersdecor.config.without_lab_furnace=Without lab furnace
|
||||
engineersdecor.config.without_electrical_furnace=Without electrical furnace
|
||||
engineersdecor.config.without_treated_wood_furniture=Without tr. wood furniture
|
||||
engineersdecor.config.without_windows=Without windows
|
||||
engineersdecor.config.without_light_sources=Without lights
|
||||
engineersdecor.config.without_ladders=Without ladders
|
||||
engineersdecor.config.without_chair_sitting=Without chair sitting
|
||||
engineersdecor.config.without_mob_chair_sitting=Without chair mob sitting
|
||||
engineersdecor.config.without_ladder_speed_boost=Without ladder speed boost
|
||||
engineersdecor.config.without_crafting_table_history=Without crafting table history
|
||||
engineersdecor.config.without_valves=Without valves
|
||||
engineersdecor.config.without_passive_fluid_accumulator=Without fluid accumulator
|
||||
engineersdecor.config.without_waste_incinerator=Without waste incinerator
|
||||
engineersdecor.config.without_sign_plates=Without signs
|
||||
engineersdecor.config.without_factory_dropper=Without factory dropper
|
||||
engineersdecor.config.without_slabs=Without slabs
|
||||
engineersdecor.config.without_halfslabs=Without slab slices
|
||||
engineersdecor.config.without_direct_slab_pickup=Without slab pickup
|
||||
engineersdecor.config.without_poles=Without poles
|
||||
engineersdecor.config.without_hsupports=Without h. supports
|
||||
engineersdecor.config.without_tooltips=Without tooltips
|
||||
engineersdecor.config.without_recipes=Without recipes
|
||||
engineersdecor.config.furnace_smelting_speed_percent=Furnace: Smelting speed %
|
||||
engineersdecor.config.furnace_fuel_efficiency_percent=Furnace: Fuel efficiency %
|
||||
engineersdecor.config.furnace_boost_energy_consumption=Furnace: Boost energy
|
||||
engineersdecor.config.chair_mob_sitting_probability_percent=Chairs: Sitting chance %
|
||||
engineersdecor.config.chair_mob_standup_probability_percent="Chairs: Stand up chance %"
|
||||
engineersdecor.config.with_crafting_quickmove_buttons=Crafting table: Move buttons
|
||||
engineersdecor.config.pipevalve_max_flowrate=Valves: Max flow rate
|
||||
engineersdecor.config.pipevalve_redstone_gain=Valves: Redstone slope
|
||||
engineersdecor.config.e_furnace_speed_percent=E-furnace: Smelting speed %
|
||||
engineersdecor.config.e_furnace_power_consumption=E-furnace: Power consumption
|
||||
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
# EOF
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
itemGroup.tabengineersdecor=工程师的装饰
|
||||
engineersdecor.config.title=工程师的装饰配置
|
||||
engineersdecor.tooltip.hint.extended=§6[按§9SHIFT§r获取更多信息§6]§r
|
||||
engineersdecor.tooltip.hint.help=§6[按§9CTRL-SHIFT§r获取帮助§6]§r
|
||||
#engineersdecor.tooltip.slabpickup.help=§rFast pickup by left-clicking while looking up/down and holding this slab.
|
||||
|
@ -180,6 +179,52 @@ tile.engineersdecor.halfslab_sheetmetal_gold.name=Gold Sheet Metal Slice
|
|||
#tile.engineersdecor.halfslab_sheetmetal_gold.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices.
|
||||
tile.engineersdecor.halfslab_sheetmetal_aluminum.name=Aluminum Sheet Metal Slice
|
||||
#tile.engineersdecor.halfslab_sheetmetal_aluminum.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices.
|
||||
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
engineersdecor.config.title=工程师的装饰配置
|
||||
engineersdecor.config.pattern_excludes=Pattern excludes
|
||||
engineersdecor.config.pattern_includes=Pattern includes
|
||||
engineersdecor.config.without_clinker_bricks=Without clinker bricks
|
||||
engineersdecor.config.without_slag_bricks=Without slag bricks
|
||||
engineersdecor.config.without_rebar_concrete=Without rebar concrete
|
||||
engineersdecor.config.without_walls=Without walls
|
||||
engineersdecor.config.without_stairs=Without stairs
|
||||
engineersdecor.config.without_ie_concrete_wall=Without concrete wall
|
||||
engineersdecor.config.without_panzer_glass=Without panzer glass
|
||||
engineersdecor.config.without_crafting_table=Without crafting table
|
||||
engineersdecor.config.without_lab_furnace=Without lab furnace
|
||||
engineersdecor.config.without_electrical_furnace=Without electrical furnace
|
||||
engineersdecor.config.without_treated_wood_furniture=Without tr. wood furniture
|
||||
engineersdecor.config.without_windows=Without windows
|
||||
engineersdecor.config.without_light_sources=Without lights
|
||||
engineersdecor.config.without_ladders=Without ladders
|
||||
engineersdecor.config.without_chair_sitting=Without chair sitting
|
||||
engineersdecor.config.without_mob_chair_sitting=Without chair mob sitting
|
||||
engineersdecor.config.without_ladder_speed_boost=Without ladder speed boost
|
||||
engineersdecor.config.without_crafting_table_history=Without crafting table history
|
||||
engineersdecor.config.without_valves=Without valves
|
||||
engineersdecor.config.without_passive_fluid_accumulator=Without fluid accumulator
|
||||
engineersdecor.config.without_waste_incinerator=Without waste incinerator
|
||||
engineersdecor.config.without_sign_plates=Without signs
|
||||
engineersdecor.config.without_factory_dropper=Without factory dropper
|
||||
engineersdecor.config.without_slabs=Without slabs
|
||||
engineersdecor.config.without_halfslabs=Without slab slices
|
||||
engineersdecor.config.without_direct_slab_pickup=Without slab pickup
|
||||
engineersdecor.config.without_poles=Without poles
|
||||
engineersdecor.config.without_hsupports=Without h. supports
|
||||
engineersdecor.config.without_tooltips=Without tooltips
|
||||
engineersdecor.config.without_recipes=Without recipes
|
||||
engineersdecor.config.furnace_smelting_speed_percent=Furnace: Smelting speed %
|
||||
engineersdecor.config.furnace_fuel_efficiency_percent=Furnace: Fuel efficiency %
|
||||
engineersdecor.config.furnace_boost_energy_consumption=Furnace: Boost energy
|
||||
engineersdecor.config.chair_mob_sitting_probability_percent=Chairs: Sitting chance %
|
||||
engineersdecor.config.chair_mob_standup_probability_percent="Chairs: Stand up chance %"
|
||||
engineersdecor.config.with_crafting_quickmove_buttons=Crafting table: Move buttons
|
||||
engineersdecor.config.pipevalve_max_flowrate=Valves: Max flow rate
|
||||
engineersdecor.config.pipevalve_redstone_gain=Valves: Redstone slope
|
||||
engineersdecor.config.e_furnace_speed_percent=E-furnace: Smelting speed %
|
||||
engineersdecor.config.e_furnace_power_consumption=E-furnace: Power consumption
|
||||
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
# EOF
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
|
|
|
@ -19,20 +19,25 @@ version = "${version_engineersdecor}"
|
|||
group = "wile.engineersdecor"
|
||||
archivesBaseName = "engineersdecor-${version_minecraft}"
|
||||
|
||||
// def signing = { ->
|
||||
// def sp = new Properties()
|
||||
// if(file("signing.properties").exists()) file("signing.properties").withInputStream { sp.load(it) }
|
||||
// return sp
|
||||
// }()
|
||||
def signing = { ->
|
||||
def sp = new Properties()
|
||||
if(file("signing.properties").exists()) file("signing.properties").withInputStream { sp.load(it) }
|
||||
return sp
|
||||
}()
|
||||
|
||||
// def git_version = { ->
|
||||
// def stdout = new ByteArrayOutputStream()
|
||||
// exec {
|
||||
// commandLine 'git', 'log', '-1', '--format=%h'
|
||||
// standardOutput = stdout
|
||||
// }
|
||||
// return stdout.toString().trim()
|
||||
// }()
|
||||
def git_version = { ->
|
||||
def stdout = new ByteArrayOutputStream()
|
||||
exec {
|
||||
commandLine 'git', 'log', '-1', '--format=%h'
|
||||
standardOutput = stdout
|
||||
}
|
||||
return stdout.toString().trim()
|
||||
}()
|
||||
|
||||
repositories {
|
||||
maven { name = "Progwml6 maven"; url = "https://dvs1.progwml6.com/files/maven/" } // JEI files
|
||||
maven { name = "ModMaven"; url = "modmaven.k-4u.nl" } // JEI files, fallback
|
||||
}
|
||||
|
||||
minecraft {
|
||||
mappings channel: 'snapshot', version: "${version_fml_mappings}"
|
||||
|
@ -63,6 +68,8 @@ minecraft {
|
|||
|
||||
dependencies {
|
||||
minecraft "net.minecraftforge:forge:${version_forge_minecraft}"
|
||||
compileOnly fg.deobf("mezz.jei:jei-${version_minecraft}:${version_jei}:api")
|
||||
runtimeOnly fg.deobf("mezz.jei:jei-${version_minecraft}:${version_jei}")
|
||||
}
|
||||
|
||||
jar {
|
||||
|
@ -80,19 +87,9 @@ jar {
|
|||
}
|
||||
|
||||
def reobfFile = file("$buildDir/reobfJar/output.jar")
|
||||
def reobfArtifact = artifacts.add('default', reobfFile) {
|
||||
type 'jar'
|
||||
builtBy 'reobfJar'
|
||||
}
|
||||
def reobfArtifact = artifacts.add('default', reobfFile) { type 'jar'; builtBy 'reobfJar'; }
|
||||
|
||||
publishing {
|
||||
publications {
|
||||
mavenJava(MavenPublication) {
|
||||
artifact reobfArtifact
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
maven {
|
||||
url "file:///${project.projectDir}/mcmodsrepo"
|
||||
}
|
||||
}
|
||||
publications { mavenJava(MavenPublication) { artifact reobfArtifact } }
|
||||
repositories { maven { url "file:///${project.projectDir}/mcmodsrepo" } }
|
||||
}
|
||||
|
|
|
@ -4,7 +4,8 @@ org.gradle.jvmargs=-Xmx8G
|
|||
version_minecraft=1.14.3
|
||||
version_forge_minecraft=1.14.3-27.0.25
|
||||
version_fml_mappings=20190621-1.14.2
|
||||
version_engineersdecor=1.0.9-b3
|
||||
version_jei=6.0.0.7
|
||||
version_engineersdecor=1.0.9-b4
|
||||
#
|
||||
# jar signing data loaded from signing.properties in the project root.
|
||||
#
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
|
||||
"1.14.3": {
|
||||
"1.0.9-b4": "[E] Experimental: Config skel ported (!not all options have effect yet).\n[E] Experimental: JEI integration for opt-outs and crafting table ported (also addresses issue #38).",
|
||||
"1.0.9-b3": "[F] Additional item drop fixes when blocks are destroyed (issue #39).",
|
||||
"1.0.9-b2": "[U] Updated to Forge 1.14.3-27.0.25/20190621-1.14.2.\n[F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting).\n[F] Fixed opening crafting table, furni, dropper server crash issue #35 (thx ProsperCraft also here).\n[F] Fixed missing pole/support item drops (issue #36, ProsperCraft).",
|
||||
"1.0.9-b1": "[U] Updated to MC1.14.3, Forge 1.14.3-27.0.17/20190621-1.14.2.\n[A] Added Small Mineral Smelter.",
|
||||
|
@ -13,6 +14,6 @@
|
|||
},
|
||||
"promos": {
|
||||
"1.14.3-recommended": "",
|
||||
"1.14.3-latest": "1.0.9-b3"
|
||||
"1.14.3-latest": "1.0.9-b4"
|
||||
}
|
||||
}
|
|
@ -10,6 +10,10 @@ Mod sources for Minecraft version 1.14.3.
|
|||
----
|
||||
## Version history
|
||||
|
||||
- v1.0.9-b4 [E] Experimental: Config skel ported (!not all options have effect yet).
|
||||
[E] Experimental: JEI integration for opt-outs and crafting table ported
|
||||
(also addresses issue #38).
|
||||
|
||||
- v1.0.9-b3 [F] Additional item drop fixes when blocks are destroyed (issue #39).
|
||||
|
||||
- v1.0.9-b2 [U] Updated to Forge 1.14.3-27.0.25/20190621-1.14.2.
|
||||
|
|
|
@ -61,6 +61,7 @@
|
|||
"1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta."
|
||||
},
|
||||
"1.14.3": {
|
||||
"1.0.9-b4": "[E] Experimental: Config skel ported (!not all options have effect yet).\n[E] Experimental: JEI integration for opt-outs and crafting table ported (also addresses issue #38).",
|
||||
"1.0.9-b3": "[F] Additional item drop fixes when blocks are destroyed (issue #39).",
|
||||
"1.0.9-b2": "[U] Updated to Forge 1.14.3-27.0.25/20190621-1.14.2.\n[F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting).\n[F] Fixed opening crafting table, furni, dropper server crash issue #35 (thx ProsperCraft also here).\n[F] Fixed missing pole/support item drops (issue #36, ProsperCraft).",
|
||||
"1.0.9-b1": "[U] Updated to MC1.14.3, Forge 1.14.3-27.0.17/20190621-1.14.2.\n[A] Added Small Mineral Smelter.",
|
||||
|
@ -77,6 +78,6 @@
|
|||
"1.13.2-recommended": "",
|
||||
"1.13.2-latest": "1.0.7-b5",
|
||||
"1.14.3-recommended": "",
|
||||
"1.14.3-latest": "1.0.9-b3"
|
||||
"1.14.3-latest": "1.0.9-b4"
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue