Skip to content

Commit

Permalink
Merge pull request #1976 from VT-14/log_cleaning
Browse files Browse the repository at this point in the history 
Removed Some Log Spam
  • Loading branch information
@WayofTime
WayofTime committed Oct 1, 2023
2 parents 3f45c35 + 3a82082 commit bccdf6c
Show file tree
Hide file tree
Showing 36 changed files with 288 additions and 266 deletions.
6 changes: 0 additions & 6 deletions src/main/resources/assets/bloodmagic/models/block/blockalchemyarray.json
View file

This file was deleted.

4 changes: 2 additions & 2 deletions src/main/resources/assets/bloodmagic/models/block/blockbloodtank.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"__comment": "Copyright © InsomniaKitten 2017",
"textures": {
"particle": "bloodmagic:blocks/BlankRune",
"texture": "bloodmagic:blocks/BloodTank"
"particle": "bloodmagic:block/blankrune",
"texture": "bloodmagic:block/bloodtank"
},
"elements": [
{
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/bloodmagic/models/block/blockdimensionalportal.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"textures": {
"particle": "bloodmagic:blocks/lifeEssenceFlowing",
"portal": "bloodmagic:blocks/lifeEssenceFlowing"
"particle": "bloodmagic:block/lifeessenceflowing",
"portal": "bloodmagic:block/lifeessenceflowing"
},
"elements": [
{ "from": [ 6, 0, 0 ],
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/bloodmagic/models/block/blockdimensionalportalew.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"textures": {
"particle": "bloodmagic:blocks/lifeEssenceFlowing",
"portal": "bloodmagic:blocks/lifeEssenceFlowing"
"particle": "bloodmagic:block/lifeessenceflowing",
"portal": "bloodmagic:block/lifeessenceflowing"
},
"elements": [
{ "from": [ 6, 0, 0 ],
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/bloodmagic/models/block/blockdimensionalportalns.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"textures": {
"particle": "bloodmagic:blocks/lifeEssenceFlowing",
"portal": "bloodmagic:blocks/lifeEssenceFlowing"
"particle": "bloodmagic:block/lifeessenceflowing",
"portal": "bloodmagic:block/lifeessenceflowing"
},
"elements": [
{ "from": [ 0, 0, 6 ],
Expand Down
7 changes: 0 additions & 7 deletions src/main/resources/assets/bloodmagic/models/block/blockinputroutingnode.json
View file

This file was deleted.

8 changes: 0 additions & 8 deletions src/main/resources/assets/bloodmagic/models/block/blockmasterroutingnode.json
View file

This file was deleted.

7 changes: 0 additions & 7 deletions src/main/resources/assets/bloodmagic/models/block/blockoutputroutingnode.json
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/resources/assets/bloodmagic/models/block/blockphantom.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "bloodmagic:blocks/PhantomBlock"
"all": "bloodmagic:block/phantomblock"
}
}
9 changes: 0 additions & 9 deletions src/main/resources/assets/bloodmagic/models/block/blocksoulforge.json
View file

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/resources/assets/bloodmagic/models/block/blockspectral.json
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_corrosive"
"layer0": "bloodmagic:item/sentientbow_corrosive"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion ...main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive_pulling_0.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_corrosive_pulling_0"
"layer0": "bloodmagic:item/sentientbow_corrosive_pulling_0"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion ...main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive_pulling_1.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_corrosive_pulling_1"
"layer0": "bloodmagic:item/sentientbow_corrosive_pulling_1"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion ...main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive_pulling_2.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_corrosive_pulling_2"
"layer0": "bloodmagic:item/sentientbow_corrosive_pulling_2"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_destructive"
"layer0": "bloodmagic:item/sentientbow_destructive"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion ...in/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive_pulling_0.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_destructive_pulling_0"
"layer0": "bloodmagic:item/sentientbow_destructive_pulling_0"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion ...in/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive_pulling_1.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_destructive_pulling_1"
"layer0": "bloodmagic:item/sentientbow_destructive_pulling_1"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion ...in/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive_pulling_2.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_destructive_pulling_2"
"layer0": "bloodmagic:item/sentientbow_destructive_pulling_2"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_pulling_0.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_pulling_0"
"layer0": "bloodmagic:item/sentientbow_pulling_0"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_pulling_1.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_pulling_1"
"layer0": "bloodmagic:item/sentientbow_pulling_1"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_pulling_2.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_pulling_2"
"layer0": "bloodmagic:item/sentientbow_pulling_2"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_steadfast"
"layer0": "bloodmagic:item/sentientbow_steadfast"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion ...main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast_pulling_0.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_steadfast_pulling_0"
"layer0": "bloodmagic:item/sentientbow_steadfast_pulling_0"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion ...main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast_pulling_1.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_steadfast_pulling_1"
"layer0": "bloodmagic:item/sentientbow_steadfast_pulling_1"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion ...main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast_pulling_2.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_steadfast_pulling_2"
"layer0": "bloodmagic:item/sentientbow_steadfast_pulling_2"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_vengeful"
"layer0": "bloodmagic:item/sentientbow_vengeful"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful_pulling_0.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_vengeful_pulling_0"
"layer0": "bloodmagic:item/sentientbow_vengeful_pulling_0"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful_pulling_1.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_vengeful_pulling_1"
"layer0": "bloodmagic:item/sentientbow_vengeful_pulling_1"
},
"display": {
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful_pulling_2.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "bloodmagic:items/SentientBow_vengeful_pulling_2"
"layer0": "bloodmagic:item/sentientbow_vengeful_pulling_2"
},
"display": {
"thirdperson_righthand": {
Expand Down

0 comments on commit bccdf6c

Please sign in to comment.