Skip to content

Commit 368f831

Browse files
committed
4.2 part 2 final i think
1 parent 03cfa57 commit 368f831

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+327
-17
lines changed

src/main/java/embin/poosmp/items/WeddingRingItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.util.List;
1919

2020
public class WeddingRingItem extends CreativeSnitchItem {
21-
public static String[] married_users = {"Embin", "ddededodediamant"};
21+
public static String[] married_users = {"Embin", "ddededodediamant", "_thecubic_", "schleop"};
2222
public WeddingRingItem(Settings settings) {
2323
super(settings);
2424
}

src/main/resources/assets/poosmp/lang/en_us.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,5 +138,9 @@
138138
"item.poosmp.red_poo_helmet": "Red Poo Helmet",
139139
"item.poosmp.red_poo_chestplate": "Red Poo Chestplate",
140140
"item.poosmp.red_poo_leggings": "Red Poo Leggings",
141-
"item.poosmp.red_poo_boots": "Red Poo Boots"
141+
"item.poosmp.red_poo_boots": "Red Poo Boots",
142+
"painting.poosmp.penguinmod.title": "PenguinMod",
143+
"painting.poosmp.penguinmod.author": "Requested by Embin",
144+
"painting.poosmp.tech_tip.title": "Tech Tip",
145+
"painting.poosmp.tech_tip.author": "Requested by Embin"
142146
}

src/main/resources/assets/poosmp/models/item/bacon_bucket.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/main/resources/assets/poosmp/models/item/red_poo_axe.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "minecraft:item/generated",
2+
"parent": "minecraft:item/handheld",
33
"textures": {
44
"layer0": "poosmp:item/red_poo_axe"
55
}

src/main/resources/assets/poosmp/models/item/red_poo_hoe.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "minecraft:item/generated",
2+
"parent": "minecraft:item/handheld",
33
"textures": {
44
"layer0": "poosmp:item/red_poo_hoe"
55
}

src/main/resources/assets/poosmp/models/item/red_poo_pickaxe.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "minecraft:item/generated",
2+
"parent": "minecraft:item/handheld",
33
"textures": {
44
"layer0": "poosmp:item/red_poo_pickaxe"
55
}

src/main/resources/assets/poosmp/models/item/red_poo_shovel.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "minecraft:item/generated",
2+
"parent": "minecraft:item/handheld",
33
"textures": {
44
"layer0": "poosmp:item/red_poo_shovel"
55
}

src/main/resources/assets/poosmp/models/item/red_poo_sword.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "minecraft:item/generated",
2+
"parent": "minecraft:item/handheld",
33
"textures": {
44
"layer0": "poosmp:item/red_poo_sword"
55
}
268 Bytes
345 Bytes

0 commit comments

Comments
 (0)