Patchouli manual category resource locations prefixed (#199). Release build.

This commit is contained in:
stfwi 2022-02-19 19:01:07 +01:00
parent d31cedfea1
commit 532612c193
67 changed files with 125 additions and 128 deletions

View file

@ -12,13 +12,11 @@ MOD_JAR=$(filter-out %-sources.jar,$(wildcard build/libs/${MOD_JAR_PREFIX}*.jar)
ifeq ($(OS),Windows_NT)
GRADLE=gradlew.bat --no-daemon
GRADLE_STOP=gradlew.bat --stop
DJS=djs
else
GRADLE=./gradlew --no-daemon
GRADLE_STOP=./gradlew --stop
DJS=djs
endif
TASK=$(DJS) ../meta/lib/tasks.js
TASK=djs ../../zmeta/lib/tasks.js
wildcardr=$(foreach d,$(wildcard $1*),$(call wildcardr,$d/,$2) $(filter $(subst *,%,$2),$d))

View file

@ -1,7 +1,10 @@
# @file gradle.properties
org.gradle.daemon=false
org.gradle.jvmargs=-Xmx8G
meta_modid=engineersdecor
meta_issues=https://github.com/stfwi/engineers-decor/issues
meta_download=https://www.curseforge.com/minecraft/mc-mods/engineers-decor/
version_minecraft=1.18.1
version_forge_minecraft=1.18.1-39.0.5
version_jei=1.18.1:9.1.2.54
version_engineersdecor=1.1.19-b3
version_engineersdecor=1.1.19

View file

@ -1,6 +1,7 @@
{
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"1.18.1": {
"1.1.19": "[R] Release build.\n[F] Manual category RLs prefixed (issue #199, ty freopt).",
"1.1.19-b3": "[F] Fixed rendering issue.",
"1.1.19-b2": "[F] Fixed waterlogging.\n[F] Block entity parent saving corrected, ticker unified.\n[U] Forge/gradle update.",
"1.1.19-b1": "[U] Initial 1.18.1 port.",
@ -49,7 +50,7 @@
"1.1.2-b1": "[U] Ported to MC1.16.2."
},
"promos": {
"1.18.1-recommended": "1.1.18",
"1.18.1-latest": "1.1.19-b3"
"1.18.1-recommended": "1.1.19",
"1.18.1-latest": "1.1.19"
}
}

View file

@ -11,6 +11,9 @@ Mod sources for Minecraft version 1.18.x.
## Version history
- v1.1.19 [R] Release build.
[F] Manual category RLs prefixed (issue #199, ty freopt).
- v1.1.19-b3 [F] Fixed rendering issue.
- v1.1.19-b2 [F] Fixed waterlogging.

View file

@ -12,7 +12,7 @@ displayName="Engineer's Decor"
description="Adds cosmetic blocks for the engineer's workshop, factory and home."
authors="wilechaote"
credits="BluSunrize, Damien Hazard, malte0811, et al., the Forge Smiths."
updateJSONURL="https://raw.githubusercontent.com/stfwi/engineers-decor/1.17/meta/update.json"
updateJSONURL="https://raw.githubusercontent.com/stfwi/engineers-decor/versions/1.18.json"
displayURL="https://github.com/stfwi/engineers-decor/"
logoFile="logo.png"

View file

@ -1,7 +1,7 @@
{
"name": "Factory Dropper",
"icon": "engineersdecor:factory_dropper",
"category": "automation",
"category": "engineersdecor:automation",
"sortnum": 6020,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Factory Hopper",
"icon": "engineersdecor:factory_hopper",
"category": "automation",
"category": "engineersdecor:automation",
"sortnum": 6010,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Factory Block Placer",
"icon": "engineersdecor:factory_placer",
"category": "automation",
"category": "engineersdecor:automation",
"sortnum": 6030,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Small Block Breaker",
"icon": "engineersdecor:small_block_breaker",
"category": "automation",
"category": "engineersdecor:automation",
"sortnum": 6040,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Small Milking Machine",
"icon": "engineersdecor:small_milking_machine",
"category": "automation",
"category": "engineersdecor:automation",
"sortnum": 6070,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Small Tree Cutter",
"icon": "engineersdecor:small_tree_cutter",
"category": "automation",
"category": "engineersdecor:automation",
"sortnum": 6050,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Small Waste Incinerator",
"icon": "engineersdecor:small_waste_incinerator",
"category": "automation",
"category": "engineersdecor:automation",
"sortnum": 6060,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Bricks",
"icon": "engineersdecor:clinker_brick_block",
"category": "buildingblocks",
"category": "engineersdecor:buildingblocks",
"sortnum": 1010,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Concretes",
"icon": "engineersdecor:rebar_concrete",
"category": "buildingblocks",
"category": "engineersdecor:buildingblocks",
"sortnum": 1020,
"pages": [
{
@ -13,10 +13,6 @@
{
"type": "text",
"text": "The rebar concrete you see here is quite expensive. It $(t:...except maybe when a Draconic Core blows up)withstands explosions$() and is comparatively hard to break.$(br2)It comes with varying textures for seamless look (placement position dependent), and can also be transformed to Stairs, Walls, Slabs, and Slab Slices. The Wall shape differs from vanilla walls."
},
{
"type": "text",
"text": "The Gas Concrete blocks have a smooth looking surface with texture variations, are fast to break, cheap to make, and have not much resistance against explosions.$(br)They are good material if you need to fill vast volumes like basement walls, tunnel walls, or floors.$(br)Walls, Stairs, Slabs, as well as Slab Slices can be crafted from Gas Concrete, too."
}
]
}

View file

@ -1,7 +1,7 @@
{
"name": "Gates and Doors",
"icon": "engineersdecor:steel_mesh_fence_gate",
"category": "buildingblocks",
"category": "engineersdecor:buildingblocks",
"sortnum": 1060,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Fences and Walls",
"icon": "engineersdecor:steel_mesh_fence",
"category": "buildingblocks",
"category": "engineersdecor:buildingblocks",
"sortnum": 1050,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Glass",
"icon": "engineersdecor:panzerglass_block",
"category": "buildingblocks",
"category": "engineersdecor:buildingblocks",
"sortnum": 1030,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Ladders",
"icon": "engineersdecor:treated_wood_ladder",
"category": "buildingblocks",
"category": "engineersdecor:buildingblocks",
"sortnum": 1080,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Slab Slices",
"icon": "engineersdecor:halfslab_rebar_concrete",
"category": "buildingblocks",
"category": "engineersdecor:buildingblocks",
"sortnum": 1040,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Windows",
"icon": "engineersdecor:treated_wood_window",
"category": "buildingblocks",
"category": "engineersdecor:buildingblocks",
"sortnum": 1070,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Furniture",
"icon": "engineersdecor:treated_wood_table",
"category": "cosmetic",
"category": "engineersdecor:cosmetic",
"sortnum": 3010,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Signs",
"icon": "engineersdecor:sign_hotwire",
"category": "cosmetic",
"category": "engineersdecor:cosmetic",
"sortnum": 3020,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Metal Crafting Table",
"icon": "engineersdecor:metal_crafting_table",
"category": "crafting",
"category": "engineersdecor:crafting",
"sortnum": 5010,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Labeled Crate",
"icon": "engineersdecor:labeled_crate",
"category": "crafting",
"category": "engineersdecor:crafting",
"sortnum": 5020,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Small Electrical Furnace",
"icon": "engineersdecor:small_electrical_furnace",
"category": "crafting",
"category": "engineersdecor:crafting",
"sortnum": 5040,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Small Laboratory Furnace",
"icon": "engineersdecor:small_lab_furnace",
"category": "crafting",
"category": "engineersdecor:crafting",
"sortnum": 5030,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Mineral Melting Furnace",
"icon": "engineersdecor:small_mineral_smelter",
"category": "crafting",
"category": "engineersdecor:crafting",
"sortnum": 5050,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Fluid Collection Funnel",
"icon": "engineersdecor:small_fluid_funnel",
"category": "fluidics",
"category": "engineersdecor:fluidics",
"sortnum": 7050,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Fluid Pipe Check Valve",
"icon": "engineersdecor:straight_pipe_valve",
"category": "fluidics",
"category": "engineersdecor:fluidics",
"sortnum": 7010,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Redstone Fluid Valve",
"icon": "engineersdecor:straight_pipe_valve_redstone",
"category": "fluidics",
"category": "engineersdecor:fluidics",
"sortnum": 7020,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Redstone Analog Fluid Valve",
"icon": "engineersdecor:straight_pipe_valve_redstone_analog",
"category": "fluidics",
"category": "engineersdecor:fluidics",
"sortnum": 7030,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Inset Lights",
"icon": "engineersdecor:iron_inset_light",
"category": "illumination",
"category": "engineersdecor:illumination",
"sortnum": 4010,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Small Solar Panel",
"icon": "engineersdecor:small_solar_panel",
"category": "power",
"category": "engineersdecor:power",
"sortnum": 8010,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Floor Gratings",
"icon": "engineersdecor:steel_floor_grating",
"category": "structural",
"category": "engineersdecor:structural",
"sortnum": 2030,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Steel Supports",
"icon": "engineersdecor:thick_steel_pole_head",
"category": "structural",
"category": "engineersdecor:structural",
"sortnum": 2020,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "Wooden Supports",
"icon": "engineersdecor:treated_wood_pole_support",
"category": "structural",
"category": "engineersdecor:structural",
"sortnum": 2010,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "工厂投掷器",
"icon": "engineersdecor:factory_dropper",
"category": "automation",
"category": "engineersdecor:automation",
"sortnum": 6020,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "工厂漏斗",
"icon": "engineersdecor:factory_hopper",
"category": "automation",
"category": "engineersdecor:automation",
"sortnum": 6010,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "工厂方块放置器",
"icon": "engineersdecor:factory_placer",
"category": "automation",
"category": "engineersdecor:automation",
"sortnum": 6030,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "小型方块破坏器",
"icon": "engineersdecor:small_block_breaker",
"category": "automation",
"category": "engineersdecor:automation",
"sortnum": 6040,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "小型挤奶机",
"icon": "engineersdecor:small_milking_machine",
"category": "automation",
"category": "engineersdecor:automation",
"sortnum": 6070,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "小型砍树机",
"icon": "engineersdecor:small_tree_cutter",
"category": "automation",
"category": "engineersdecor:automation",
"sortnum": 6050,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "小型垃圾焚烧炉",
"icon": "engineersdecor:small_waste_incinerator",
"category": "automation",
"category": "engineersdecor:automation",
"sortnum": 6060,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "砖块",
"icon": "engineersdecor:clinker_brick_block",
"category": "buildingblocks",
"category": "engineersdecor:buildingblocks",
"sortnum": 1010,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "混凝土",
"icon": "engineersdecor:rebar_concrete",
"category": "buildingblocks",
"category": "engineersdecor:buildingblocks",
"sortnum": 1020,
"pages": [
{
@ -13,10 +13,6 @@
{
"type": "text",
"text": "你在这看见的钢筋混凝土十分昂贵。它能$(t:……除非可能一个龙堆爆了)抵挡爆炸$(),而且相对更难破坏。$(br2)它带有不同的纹理,可以实现无缝的外观(根据放置位置而定),还可以转化为楼梯、墙壁、台阶和切片。墙的形状和原版墙不同。"
},
{
"type": "text",
"text": "加气混凝土砌块的表面看起来很光滑,有材质变化,破坏快,制作成本低,抗爆能力不强。$(br)如果你需要填充巨大的体积,如地下室墙壁,隧道墙壁或地板,它们是很好的材料。$(br)加气混凝土也有对应的墙壁、楼梯、台阶和切片。"
}
]
}

View file

@ -1,7 +1,7 @@
{
"name": "门",
"icon": "engineersdecor:steel_mesh_fence_gate",
"category": "buildingblocks",
"category": "engineersdecor:buildingblocks",
"sortnum": 1060,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "栅栏和墙",
"icon": "engineersdecor:steel_mesh_fence",
"category": "buildingblocks",
"category": "engineersdecor:buildingblocks",
"sortnum": 1050,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "玻璃",
"icon": "engineersdecor:panzerglass_block",
"category": "buildingblocks",
"category": "engineersdecor:buildingblocks",
"sortnum": 1030,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "梯子",
"icon": "engineersdecor:treated_wood_ladder",
"category": "buildingblocks",
"category": "engineersdecor:buildingblocks",
"sortnum": 1080,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "台阶薄片",
"icon": "engineersdecor:halfslab_rebar_concrete",
"category": "buildingblocks",
"category": "engineersdecor:buildingblocks",
"sortnum": 1040,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "窗户",
"icon": "engineersdecor:treated_wood_window",
"category": "buildingblocks",
"category": "engineersdecor:buildingblocks",
"sortnum": 1070,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "家具",
"icon": "engineersdecor:treated_wood_table",
"category": "cosmetic",
"category": "engineersdecor:cosmetic",
"sortnum": 3010,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "标志牌",
"icon": "engineersdecor:sign_hotwire",
"category": "cosmetic",
"category": "engineersdecor:cosmetic",
"sortnum": 3020,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "金属工作台",
"icon": "engineersdecor:metal_crafting_table",
"category": "crafting",
"category": "engineersdecor:crafting",
"sortnum": 5010,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "带标签的储物箱",
"icon": "engineersdecor:labeled_crate",
"category": "crafting",
"category": "engineersdecor:crafting",
"sortnum": 5020,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "小型电炉",
"icon": "engineersdecor:small_electrical_furnace",
"category": "crafting",
"category": "engineersdecor:crafting",
"sortnum": 5040,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "小型实验室炉",
"icon": "engineersdecor:small_lab_furnace",
"category": "crafting",
"category": "engineersdecor:crafting",
"sortnum": 5030,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "矿物熔炼炉",
"icon": "engineersdecor:small_mineral_smelter",
"category": "crafting",
"category": "engineersdecor:crafting",
"sortnum": 5050,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "流体收集漏斗",
"icon": "engineersdecor:small_fluid_funnel",
"category": "fluidics",
"category": "engineersdecor:fluidics",
"sortnum": 7050,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "输液管止回阀",
"icon": "engineersdecor:straight_pipe_valve",
"category": "fluidics",
"category": "engineersdecor:fluidics",
"sortnum": 7010,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "红石流体阀",
"icon": "engineersdecor:straight_pipe_valve_redstone",
"category": "fluidics",
"category": "engineersdecor:fluidics",
"sortnum": 7020,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "红石模拟流体阀",
"icon": "engineersdecor:straight_pipe_valve_redstone_analog",
"category": "fluidics",
"category": "engineersdecor:fluidics",
"sortnum": 7030,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "嵌入灯",
"icon": "engineersdecor:iron_inset_light",
"category": "illumination",
"category": "engineersdecor:illumination",
"sortnum": 4010,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "小型太阳能板",
"icon": "engineersdecor:small_solar_panel",
"category": "power",
"category": "engineersdecor:power",
"sortnum": 8010,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "地板格栅",
"icon": "engineersdecor:steel_floor_grating",
"category": "structural",
"category": "engineersdecor:structural",
"sortnum": 2030,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "钢支架",
"icon": "engineersdecor:thick_steel_pole_head",
"category": "structural",
"category": "engineersdecor:structural",
"sortnum": 2020,
"pages": [
{

View file

@ -1,7 +1,7 @@
{
"name": "木杆",
"icon": "engineersdecor:treated_wood_pole_support",
"category": "structural",
"category": "engineersdecor:structural",
"sortnum": 2010,
"pages": [
{