From d57ca371e2f3645b2619b93a912012ad193f0f96 Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Tue, 14 Apr 2020 02:21:35 +0200 Subject: [PATCH] fix panic --- assets/world/tree/desert_palm/1.vox | 2 +- assets/world/tree/desert_palm/10.vox | 4 ++-- assets/world/tree/desert_palm/2.vox | 2 +- assets/world/tree/desert_palm/3.vox | 2 +- assets/world/tree/desert_palm/4.vox | 2 +- assets/world/tree/desert_palm/5.vox | 2 +- assets/world/tree/desert_palm/6.vox | 2 +- assets/world/tree/desert_palm/7.vox | 2 +- assets/world/tree/desert_palm/8.vox | 4 ++-- assets/world/tree/desert_palm/9.vox | 2 +- voxygen/src/scene/terrain.rs | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/assets/world/tree/desert_palm/1.vox b/assets/world/tree/desert_palm/1.vox index 10d86ddf6e..3fa08ff0ff 100644 --- a/assets/world/tree/desert_palm/1.vox +++ b/assets/world/tree/desert_palm/1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb2ab9b7dab8a3806035a651ef45373d19bf5eb75aa27879274abad643243904 +oid sha256:6cfa51cd9bedf24d727aeffb809b0c673dc8cb15aeb0a7b6a23e05aac2121436 size 2580 diff --git a/assets/world/tree/desert_palm/10.vox b/assets/world/tree/desert_palm/10.vox index 1f310bd412..4f5a6d283d 100644 --- a/assets/world/tree/desert_palm/10.vox +++ b/assets/world/tree/desert_palm/10.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0deb3f56dd5c3585dec5e7b33b99cb45d4546bfc9a8847292ac3b5bb79e2a37 -size 3364 +oid sha256:51c8a5c03190aaf0752b0c2dcc1f2d3aa4744afadd3b45774b157498ac0ad717 +size 3356 diff --git a/assets/world/tree/desert_palm/2.vox b/assets/world/tree/desert_palm/2.vox index 7040de600c..644b57f599 100644 --- a/assets/world/tree/desert_palm/2.vox +++ b/assets/world/tree/desert_palm/2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83a26ee836b81eb521cf8c9ac32eaf65adb749d37e2fbbc5f9cbb6f6f49423af +oid sha256:3980edde33843925e017e7986c3722ce03202119f95b177f3dbde45dd47084ef size 2544 diff --git a/assets/world/tree/desert_palm/3.vox b/assets/world/tree/desert_palm/3.vox index eace282e91..681c7602ef 100644 --- a/assets/world/tree/desert_palm/3.vox +++ b/assets/world/tree/desert_palm/3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18654995a7575fb34dc26792395e558faf9f14e0fd63922c933faec1c04f60ea +oid sha256:65973116a2c4e2166b06c93c40bbdf2cb0cd055186e997eb13a9d4665a360407 size 2740 diff --git a/assets/world/tree/desert_palm/4.vox b/assets/world/tree/desert_palm/4.vox index a4fa730635..486f8ce1ae 100644 --- a/assets/world/tree/desert_palm/4.vox +++ b/assets/world/tree/desert_palm/4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:028cc39e9930d439add126d8915273c77b8ba80a31d3f7a6446286e84c021665 +oid sha256:c739af1da0a6502dc333e8f26e6aa3c5b43dd1bf9a739fa1183a6925b06c3d95 size 2676 diff --git a/assets/world/tree/desert_palm/5.vox b/assets/world/tree/desert_palm/5.vox index 03a5b24e51..82f66b0390 100644 --- a/assets/world/tree/desert_palm/5.vox +++ b/assets/world/tree/desert_palm/5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c906818d61d00d17ee1263d3dff11b285a765103dbd0a16dd1b7c6ae12bf224e +oid sha256:839d59a6899359d75ae40ede6eab197e4438753afb36b59dac03217a1867cdf1 size 2680 diff --git a/assets/world/tree/desert_palm/6.vox b/assets/world/tree/desert_palm/6.vox index 5546e98098..2978b19852 100644 --- a/assets/world/tree/desert_palm/6.vox +++ b/assets/world/tree/desert_palm/6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5623e0b6bad9e628a2ff47d8b78f5fbea6bac3263c0e29d732658a9ac813b78e +oid sha256:fa64cff8589f64f1857975b3acba8fa16c24b1d19d6482f9ff08fdd95d8705e7 size 2780 diff --git a/assets/world/tree/desert_palm/7.vox b/assets/world/tree/desert_palm/7.vox index a5f4aaef27..f3095c9076 100644 --- a/assets/world/tree/desert_palm/7.vox +++ b/assets/world/tree/desert_palm/7.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e16fbe4c4b055bcb8d15a06ca28d0b54f6805a008c9133952dec8c340d08c53 +oid sha256:2bf99aeaf0936a67fea13d715095ed53506859723e2543838de9d561c8b9e2cb size 3048 diff --git a/assets/world/tree/desert_palm/8.vox b/assets/world/tree/desert_palm/8.vox index 833fe244ea..fbd63a59d0 100644 --- a/assets/world/tree/desert_palm/8.vox +++ b/assets/world/tree/desert_palm/8.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de446c9f596278bd36fbec49791ed2f7b100f0755fc70be39ab5ae711e9b4bab -size 2712 +oid sha256:2581ec5257928a5d5fd64e533bef1ba7267438ce6fae5849a39bccdd547b7ba3 +size 2716 diff --git a/assets/world/tree/desert_palm/9.vox b/assets/world/tree/desert_palm/9.vox index 4ac78f20fc..6af18dd413 100644 --- a/assets/world/tree/desert_palm/9.vox +++ b/assets/world/tree/desert_palm/9.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e51849f6c3faf01fb9526174733911c75f92204e914fd973894c71c09bd470e9 +oid sha256:b787e74402728a73be2963533ae5f2e1438fdb90345b0e3d0e6f0452ae314b60 size 3164 diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs index 2652fad6a6..8f75cdd7e5 100644 --- a/voxygen/src/scene/terrain.rs +++ b/voxygen/src/scene/terrain.rs @@ -1303,7 +1303,7 @@ impl Terrain { ), // Coconut ( - (BlockKind::WheatGreen, 0), + (BlockKind::Coconut, 0), make_model( "voxygen.voxel.sprite.fruit.coconut", Vec3::new(-6.0, -6.0, 0.0),