-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Reapply "Merge branch 'dev/avalon/particles' into dev/avalon/…
…main"" This reverts commit f51f06f.
- Loading branch information
1 parent
f51f06f
commit 1fa590c
Showing
77 changed files
with
463 additions
and
1,394 deletions.
There are no files selected for viewing
736 changes: 189 additions & 547 deletions
736
src/main/java/pl/pabilo8/immersiveintelligence/client/fx/IIParticles.java
Large diffs are not rendered by default.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
4 changes: 0 additions & 4 deletions
4
...rces/assets/immersiveintelligence/models/particle/block/block_particle/block_particle.mtl
This file was deleted.
Oops, something went wrong.
1 change: 0 additions & 1 deletion
1
.../assets/immersiveintelligence/models/particle/block/block_particle/block_particle.obj.amt
This file was deleted.
Oops, something went wrong.
Binary file removed
BIN
-3.02 KB
...iveintelligence/models/particle/block/block_pen/3partpenparticle_smoke_anim.png
Binary file not shown.
153 changes: 0 additions & 153 deletions
153
src/main/resources/assets/immersiveintelligence/models/particle/block/block_pen/P1.obj
This file was deleted.
Oops, something went wrong.
51 changes: 0 additions & 51 deletions
51
src/main/resources/assets/immersiveintelligence/models/particle/block/block_pen/P2.obj
This file was deleted.
Oops, something went wrong.
51 changes: 0 additions & 51 deletions
51
src/main/resources/assets/immersiveintelligence/models/particle/block/block_pen/P3.obj
This file was deleted.
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
10
...main/resources/assets/immersiveintelligence/models/particle/block/block_pen/block_pen.mtl
This file was deleted.
Oops, something went wrong.
1 change: 0 additions & 1 deletion
1
.../resources/assets/immersiveintelligence/models/particle/block/block_pen/block_pen.obj.amt
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
src/main/resources/assets/immersiveintelligence/models/particle/debris/cloth/cloth.mtl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # Made by Pabilo8 with Blockbench | ||
|
|
||
| newmtl cloth_device_cushion | ||
| map_Kd immersiveintelligence:particle/debris/cloth/cloth_device_cushion | ||
| map_Kd immersiveintelligence:block/cloth_device_cushion |
Binary file removed
BIN
-466 Bytes
...ets/immersiveintelligence/models/particle/debris/cloth/cloth_device_cushion.png
Binary file not shown.
2 changes: 1 addition & 1 deletion
2
src/main/resources/assets/immersiveintelligence/models/particle/debris/flesh/flesh.mtl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # Made by Pabilo8 with Blockbench | ||
|
|
||
| newmtl slime | ||
| map_Kd minecraft:blocks/slime | ||
| map_Kd immersiveintelligence:block/slime |
4 changes: 2 additions & 2 deletions
4
src/main/resources/assets/immersiveintelligence/models/particle/debris/gear/gears.mtl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # Made by Pabilo8 with Blockbench | ||
|
|
||
| newmtl GEARZ | ||
| map_Kd immersiveintelligence:particle/debris/gear/gears | ||
| newmtl gearz | ||
| map_Kd immersiveintelligence:block/gearz |
Binary file removed
BIN
-185 Bytes
...in/resources/assets/immersiveintelligence/models/particle/debris/gear/gears.png
Binary file not shown.
Binary file removed
BIN
-200 Bytes
...n/resources/assets/immersiveintelligence/models/particle/debris/glass/glass.png
Binary file not shown.
2 changes: 1 addition & 1 deletion
2
src/main/resources/assets/immersiveintelligence/models/particle/debris/rivet/rivet.mtl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # Made by Pabilo8 with Blockbench | ||
|
|
||
| newmtl storage_steel | ||
| map_Kd immersiveintelligence:particle/debris/rivet/storage_steel | ||
| map_Kd immersiveintelligence:block/storage_steel |
Binary file removed
BIN
-494 Bytes
...ces/assets/immersiveintelligence/models/particle/debris/rivet/storage_steel.png
Binary file not shown.
Binary file removed
BIN
-511 Bytes
...ssets/immersiveintelligence/models/particle/debris/wire/common_copper_cable.png
Binary file not shown.
2 changes: 1 addition & 1 deletion
2
src/main/resources/assets/immersiveintelligence/models/particle/debris/wire/wiring.mtl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # Made by Pabilo8 with Blockbench | ||
|
|
||
| newmtl common_copper_cable | ||
| map_Kd immersiveintelligence:particle/debris/wire/common_copper_cable | ||
| map_Kd immersiveintelligence:block/common/common_copper_cable |
Binary file removed
BIN
-3.43 KB
src/main/resources/assets/immersiveintelligence/models/particle/dust_pile/dust.png
Binary file not shown.
14 changes: 3 additions & 11 deletions
14
src/main/resources/assets/immersiveintelligence/models/particle/dust_pile/dust_pile.mtl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,4 @@ | ||
| # Made with Blockbench | ||
| # Made by Pabilo8 with Blockbench | ||
|
|
||
| newmtl dust_pile_tiny | ||
| map_Kd immersiveintelligence:particle/dust_pile/dust | ||
| newmtl dust_pile_small | ||
| map_Kd immersiveintelligence:particle/dust_pile/dust | ||
| newmtl dust_pile_medium | ||
| map_Kd immersiveintelligence:particle/dust_pile/dust | ||
| newmtl dust_pile_large | ||
| map_Kd immersiveintelligence:particle/dust_pile/dust | ||
| newmtl dust_pile_big | ||
| map_Kd immersiveintelligence:particle/dust_pile/dust | ||
| newmtl dust | ||
| map_Kd immersiveintelligence:blocks/multiblock/sawmill/dust |
File renamed without changes.
File renamed without changes.
4 changes: 0 additions & 4 deletions
4
src/main/resources/assets/immersiveintelligence/models/particle/metalspark/metalspark.mtl
This file was deleted.
Oops, something went wrong.
1 change: 0 additions & 1 deletion
1
...main/resources/assets/immersiveintelligence/models/particle/metalspark/metalspark.obj.amt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.