Merge remote-tracking branch 'origin/master'

2025-07-18 18:23:06 +00:00 · 2020-01-08 14:17:21 -05:00 · 2020-01-08 14:17:21 -05:00 · 431eea9152
commit 431eea9152
parent d53ec07857 4825b21951
22 changed files with 0 additions and 0 deletions
--- a/src/main/resources/pack/objects/house/rustic/medium/rustic1.ish
+++ b/src/main/resources/pack/objects/house/rustic/medium/rustic1.ish
--- a/src/main/resources/pack/objects/house/rustic/medium/rustic2.ish
+++ b/src/main/resources/pack/objects/house/rustic/medium/rustic2.ish
--- a/src/main/resources/pack/objects/house/rustic/medium/rustic3.ish
+++ b/src/main/resources/pack/objects/house/rustic/medium/rustic3.ish
--- a/src/main/resources/pack/objects/house/rustic/medium/rustic4.ish
+++ b/src/main/resources/pack/objects/house/rustic/medium/rustic4.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch1.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch1.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch10.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch10.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch11.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch11.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch12.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch12.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch13.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch13.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch14.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch14.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch15.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch15.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch16.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch16.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch17.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch17.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch18.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch18.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch2.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch2.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch3.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch3.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch4.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch4.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch5.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch5.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch6.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch6.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch7.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch7.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch8.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch8.ish
--- a/src/main/resources/pack/objects/tree/birch/large/birch9.ish
+++ b/src/main/resources/pack/objects/tree/birch/large/birch9.ish