Skip to content

Commit

Permalink
1.21.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@matthewperiut
matthewperiut committed Dec 4, 2024
1 parent fcd97af commit 7f27c73
Show file tree
Hide file tree
Showing 58 changed files with 334 additions and 15 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ jobs:
dependencies: |
fabric-api(required)
architectury-api(required)
athena-ctm(required){modrinth:b1ZV3DIJ}{curseforge:841890}
chisel-reborn(required)
game-version-filter: releases # Defaults to selecting the latest compatible version of Minecraft, using the tag from the fabric.mod.json
Expand Down Expand Up @@ -89,7 +88,6 @@ jobs:

dependencies: |
architectury-api(required)
athena-ctm(required){modrinth:b1ZV3DIJ}{curseforge:841890}
chisel-reborn(required)
game-version-filter: releases # Defaults to selecting the latest compatible version of Minecraft, using the tag from the fabric.mod.json
2 changes: 1 addition & 1 deletion common/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ loom {
dependencies {
// We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
// Do NOT use other classes from fabric loader
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}"
// Remove the next line if you don't want to depend on the API
modApi "dev.architectury:architectury:${rootProject.architectury_version}"

Expand Down
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/bcircuit.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/bcircuit"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/bwireframe.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/bwireframe"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/cables.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/cables"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/caution.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/caution"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/circuit.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/circuit"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/engineer.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/engineer"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/engineer1.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/engineer1"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/engineer2.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/engineer2"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/engineer3.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/engineer3"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/exhaust.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/exhaust"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/factory.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/factory"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/fan.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/fan"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/fan_four.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/fan_four"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/fan_four_on.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/fan_four_on"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/fan_malfunction.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/fan_malfunction"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/fan_malfunction_on.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/fan_malfunction_on"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/fan_on.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/fan_on"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/fan_side.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/fan_side"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/gcircuit.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/gcircuit"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/gears.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/gears"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/grate.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/grate"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/grinder.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/grinder"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/gvent.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/gvent"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/hazard.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/hazard"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/hazardo.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/hazardo"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/hex.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/hex"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/ice.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/ice"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/insulation.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/insulation"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/large_pipes.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/large_pipes"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/large_plating.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/large_plating"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/medium_fan.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/medium_fan"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/megacell.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/megacell"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/metalbox.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/metalbox"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/mosaic.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/mosaic"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/multi.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/multi"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/old_vents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/old_vents"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/pgcircuit.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/pgcircuit"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/piping.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/piping"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/pwireframe.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/pwireframe"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/rgrate.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/rgrate"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/rust.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/rust"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/rust_bplates.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/rust_bplates"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/rust_plates.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/rust_plates"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/rusty_scaffold.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/rusty_scaffold"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/scaffold.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/scaffold"
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/factory_blocks/items/small_pipes.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "factory_blocks:item/small_pipes"
}
}
Loading

0 comments on commit 7f27c73

Please sign in to comment.