Skip to content

Commit

Permalink
The great merge
Browse files Browse the repository at this point in the history
  • Loading branch information
IThundxr committed Aug 7, 2024
2 parents ee619f0 + a37acd5 commit b9e6494
Show file tree
Hide file tree
Showing 840 changed files with 13,488 additions and 6,639 deletions.
Binary file modified .idea/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ loader_version = 0.15.7
fabric_version = 0.77.0+1.18.2

# Mod Properties
mod_version = 0.5.1-f
mod_version = 0.5.1-g
maven_group = com.simibubi.create

# Dependencies
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/assets/create/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -1289,6 +1289,7 @@
"create.item_attributes.smokable.inverted": "p\u01DD\u029Eo\u026FS \u01DDq \u0287ouu\u0250\u0254",
"create.item_attributes.washable": "p\u01DD\u0265s\u0250M \u01DDq u\u0250\u0254",
"create.item_attributes.washable.inverted": "p\u01DD\u0265s\u0250M \u01DDq \u0287ouu\u0250\u0254",
"create.keyinfo.ponder": "\u0279\u01DDpuo\u0500",
"create.keyinfo.scrolldown": ")p\u05DF\u0279o\u028Du\u0131( u\u028Do\u15E1 \u05DF\u01DD\u01DD\u0265\u028D\u01DDsnoW \u01DD\u0287\u0250\u05DFn\u026F\u0131S",
"create.keyinfo.scrollup": ")p\u05DF\u0279o\u028Du\u0131( d\u2229 \u05DF\u01DD\u01DD\u0265\u028D\u01DDsnoW \u01DD\u0287\u0250\u05DFn\u026F\u0131S",
"create.keyinfo.toolbelt": "s\u01DDxoq\u05DFoo\u27D8 \u028Eq\u0279\u0250\u01DDN ss\u01DD\u0254\u0254\u2C6F",
Expand Down Expand Up @@ -1781,7 +1782,7 @@
"create.ponder.mechanical_arm_redstone.text_1": "\u01DD\u0287\u0250\u028C\u0131\u0287\u0254\u0250 \u0287ou \u05DF\u05DF\u0131\u028D s\u026F\u0279\u2C6F \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW '\u01DDuo\u0287sp\u01DD\u1D1A \u028Eq p\u01DD\u0279\u01DD\u028Dod u\u01DD\u0265M",
"create.ponder.mechanical_arm_redstone.text_2": "s\u01DD\u05DF\u0254\u028E\u0254 p\u01DD\u0287\u0279\u0250\u0287s \u028Eu\u0250 \u0265s\u0131u\u0131\u025F \u05DF\u05DF\u0131\u028D \u0287\u0131 'bu\u0131ddo\u0287s \u01DD\u0279o\u025F\u01DD\u15FA",
"create.ponder.mechanical_arm_redstone.text_3": "\u01DD\u05DF\u0254\u028E\u0254 uo\u0131\u0287\u0250\u028C\u0131\u0287\u0254\u0250 \u01DDuo \u028E\u05DF\u0287\u0254\u0250x\u01DD \u0279\u01DDbb\u0131\u0279\u0287 o\u0287 p\u01DDsn \u01DDq u\u0250\u0254 \u01DDs\u05DFnd \u01DD\u028C\u0131\u0287\u0250b\u01DDu \u0250 'sn\u0265\u27D8",
"create.ponder.mechanical_bearing.header": "bu\u0131\u0279\u0250\u01DD\u15FA \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW \u01DD\u0265\u0287 bu\u0131sn s\u01DD\u0279n\u0287\u0254n\u0279\u0287S sbu\u0131\u028CoW",
"create.ponder.mechanical_bearing.header": "bu\u0131\u0279\u0250\u01DD\u15FA \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW \u01DD\u0265\u0287 bu\u0131sn s\u01DD\u0279n\u0287\u0254n\u0279\u0287S bu\u0131\u028CoW",
"create.ponder.mechanical_bearing.text_1": "\u026F\u01DD\u0265\u0287 \u025Fo \u0287uo\u0279\u025F u\u0131 \u029E\u0254o\u05DFq \u01DD\u0265\u0287 o\u0287 \u0265\u0254\u0250\u0287\u0287\u0250 sbu\u0131\u0279\u0250\u01DD\u15FA \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW",
"create.ponder.mechanical_bearing.text_2": "uo\u0131\u0287d\u0250\u0279\u0287uo\u0186 bu\u0131\u0287\u0250\u0287o\u1D1A \u0250 o\u0287u\u0131 \u0287\u0131 \u01DD\u05DFq\u026F\u01DDss\u0250 \u05DF\u05DF\u0131\u028D \u0287\u0131 '\u01DD\u0254\u0279o\u2132 \u05DF\u0250uo\u0131\u0287\u0250\u0287o\u1D1A bu\u0131\u028C\u0131\u01DD\u0254\u01DD\u0279 uod\u2229",
"create.ponder.mechanical_crafter.header": "s\u0279\u01DD\u0287\u025F\u0250\u0279\u0186 \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW dn bu\u0131\u0287\u0287\u01DDS",
Expand Down Expand Up @@ -2519,6 +2520,7 @@
"create.subtitle.schematicannon_launch_block": "s\u01DD\u0279\u0131\u025F uouu\u0250\u0254\u0131\u0287\u0250\u026F\u01DD\u0265\u0254S",
"create.subtitle.scroll_value": "s\u029E\u0254\u0131\u05DF\u0254 \u0287ndu\u0131-\u05DF\u05DFo\u0279\u0254S",
"create.subtitle.slime_added": "s\u01DD\u0265s\u0131nbs \u01DD\u026F\u0131\u05DFS",
"create.subtitle.spout": "s\u0287\u0279nds \u0287nodS",
"create.subtitle.steam": "s\u01DDs\u0131ou \u026F\u0250\u01DD\u0287S",
"create.subtitle.train": "\u01DD\u05DFq\u026Fn\u0279 s\u05DF\u01DD\u01DD\u0265\u028D \u028E\u01DDbo\u15FA",
"create.subtitle.train3": "p\u01DD\u05DF\u025F\u025Fn\u026F \u01DD\u05DFq\u026Fn\u0279 s\u05DF\u01DD\u01DD\u0265\u028D \u028E\u01DDbo\u15FA",
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/assets/create/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -1289,6 +1289,7 @@
"create.item_attributes.smokable.inverted": "cannot be Smoked",
"create.item_attributes.washable": "can be Washed",
"create.item_attributes.washable.inverted": "cannot be Washed",
"create.keyinfo.ponder": "Ponder",
"create.keyinfo.scrolldown": "Simulate Mousewheel Down (inworld)",
"create.keyinfo.scrollup": "Simulate Mousewheel Up (inworld)",
"create.keyinfo.toolbelt": "Access Nearby Toolboxes",
Expand Down Expand Up @@ -1781,7 +1782,7 @@
"create.ponder.mechanical_arm_redstone.text_1": "When powered by Redstone, Mechanical Arms will not activate",
"create.ponder.mechanical_arm_redstone.text_2": "Before stopping, it will finish any started cycles",
"create.ponder.mechanical_arm_redstone.text_3": "Thus, a negative pulse can be used to trigger exactly one activation cycle",
"create.ponder.mechanical_bearing.header": "Movings Structures using the Mechanical Bearing",
"create.ponder.mechanical_bearing.header": "Moving Structures using the Mechanical Bearing",
"create.ponder.mechanical_bearing.text_1": "Mechanical Bearings attach to the block in front of them",
"create.ponder.mechanical_bearing.text_2": "Upon receiving Rotational Force, it will assemble it into a Rotating Contraption",
"create.ponder.mechanical_crafter.header": "Setting up Mechanical Crafters",
Expand Down Expand Up @@ -2519,6 +2520,7 @@
"create.subtitle.schematicannon_launch_block": "Schematicannon fires",
"create.subtitle.scroll_value": "Scroll-input clicks",
"create.subtitle.slime_added": "Slime squishes",
"create.subtitle.spout": "Spout spurts",
"create.subtitle.steam": "Steam noises",
"create.subtitle.train": "Bogey wheels rumble",
"create.subtitle.train3": "Bogey wheels rumble muffled",
Expand Down
37 changes: 37 additions & 0 deletions src/generated/resources/assets/create/sounds.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,22 @@
}
]
},
"clipboard_check": {
"sounds": [
{
"name": "create:clipboard_check",
"type": "file"
}
]
},
"clipboard_erase": {
"sounds": [
{
"name": "create:clipboard_erase",
"type": "file"
}
]
},
"cogs": {
"sounds": [
{
Expand Down Expand Up @@ -388,6 +404,27 @@
],
"subtitle": "create.subtitle.slime_added"
},
"spout": {
"sounds": [
{
"name": "create:spout",
"type": "file"
},
{
"name": "create:spout_1",
"type": "file"
},
{
"name": "create:spout_2",
"type": "file"
},
{
"name": "create:spout_3",
"type": "file"
}
],
"subtitle": "create.subtitle.spout"
},
"steam": {
"sounds": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:blasting/ingot_aluminum_compat_ic2"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_aluminum"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:blasting/ingot_aluminum_compat_ic2"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:blasting/ingot_silver_compat_ic2"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_silver"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:blasting/ingot_silver_compat_ic2"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:blasting/ingot_tin_compat_ic2"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_tin"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:blasting/ingot_tin_compat_ic2"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:blasting/ingot_uranium_compat_ic2"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_uranium"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:blasting/ingot_uranium_compat_ic2"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:blasting/lead_ingot_compat_oreganized"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_lead"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:blasting/lead_ingot_compat_oreganized"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:blasting/silver_ingot_compat_galosphere"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_silver"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:blasting/silver_ingot_compat_galosphere"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:blasting/silver_ingot_compat_iceandfire"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_silver"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:blasting/silver_ingot_compat_iceandfire"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:blasting/silver_ingot_compat_oreganized"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_silver"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:blasting/silver_ingot_compat_oreganized"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
Loading

0 comments on commit b9e6494

Please sign in to comment.