diff --git a/Win/Mineways.cpp b/Win/Mineways.cpp
index 1534641..151ea5b 100644
--- a/Win/Mineways.cpp
+++ b/Win/Mineways.cpp
@@ -3586,7 +3586,7 @@ static int loadWorld(HWND hWnd)
// load test world
MY_ASSERT(gWorldGuide.world[0] == 0);
gSpawnX = gSpawnY = gSpawnZ = gPlayerX = gPlayerY = gPlayerZ = 0;
- gVersionID = 3837; // Change this to the current release number https://minecraft.wiki/w/Data_version
+ gVersionID = 3953; // Change this to the current release number https://minecraft.wiki/w/Data_version
gMinecraftVersion = DATA_VERSION_TO_RELEASE_NUMBER(gVersionID);
setHeightsFromVersionID();
break;
diff --git a/Win/ObjFileManip.cpp b/Win/ObjFileManip.cpp
index 8e019cb..328ffa3 100644
--- a/Win/ObjFileManip.cpp
+++ b/Win/ObjFileManip.cpp
@@ -6598,11 +6598,11 @@ static int saveBillboardOrGeometry(int boxIndex, int type)
minx = 6;
maxx = 10;
minz = 5;
- maxz = 12;
+ maxz = 11;
}
else {
minx = 5;
- maxx = 12;
+ maxx = 11;
minz = 6;
maxz = 10;
}
@@ -6611,23 +6611,23 @@ static int saveBillboardOrGeometry(int boxIndex, int type)
minx = 0;
maxx = 2 - bitAdd;
minz = 5;
- maxz = 12;
+ maxz = 11;
break;
case 2: // west
minx = 14 + bitAdd;
maxx = 16;
minz = 5;
- maxz = 12;
+ maxz = 11;
break;
case 3: // south
minx = 5;
- maxx = 12;
+ maxx = 11;
minz = 0;
maxz = 2 - bitAdd;
break;
case 4: // north
minx = 5;
- maxx = 12;
+ maxx = 11;
minz = 14 + bitAdd;
maxz = 16;
break;
@@ -6639,11 +6639,11 @@ static int saveBillboardOrGeometry(int boxIndex, int type)
minx = 6;
maxx = 10;
minz = 5;
- maxz = 12;
+ maxz = 11;
}
else {
minx = 5;
- maxx = 12;
+ maxx = 11;
minz = 6;
maxz = 10;
}
@@ -20756,10 +20756,11 @@ static int getSwatch(int type, int dataVal, int faceDirection, int backgroundInd
case BLOCK_BOOKSHELF: // getSwatch
if (dataVal & BIT_16)
{
+ // chiseled bookshelf, that has a direction and whether face is full or empty of books (no in between - texture limitation)
// sides and top/bottom
SWATCH_SWITCH_SIDE_VERTICAL(faceDirection, 8, 61, 7, 61);
- // now, for one of the side faces, put occupied or not
- frontLoc = SWATCH_INDEX(9 + ((dataVal & 0x8) ? 1:0), 61);
+ // now, for one of the side faces, put occupied or not; 0x8 is occupied, grabs occupied tile
+ frontLoc = (dataVal & 0x8) ? SWATCH_INDEX(14, 66) : SWATCH_INDEX(9, 61);
// Look at direction, change that face. A bit inefficient.
switch (dataVal & 0x7)
{
@@ -26450,13 +26451,7 @@ static int createBaseMaterialTexture()
for (i = 0; i < TOTAL_TILES; i++)
{
// check that I didn't forget to give each a material type it's associated with - if hit, go to tiles.h and add an entry
- assert(true
-
-
-
-
-
- || gTilesTable[i].typeForMtl || wcslen(gTilesTable[i].filename) == 0);
+ assert(gTilesTable[i].typeForMtl || wcslen(gTilesTable[i].filename) == 0);
// If leaves are to be made solid and so should have alphas all equal to 1.0.
if (gModel.options->pEFD->chkLeavesSolid && (gTilesTable[i].flags & SBIT_LEAVES))
diff --git a/Win/ObjFileManip.h b/Win/ObjFileManip.h
index 1741158..f54b788 100644
--- a/Win/ObjFileManip.h
+++ b/Win/ObjFileManip.h
@@ -336,7 +336,7 @@ extern Model gModel;
((worldVersion) <= 2730) ? 17 : \
((worldVersion) <= 2975) ? 18 : \
((worldVersion) <= 3442) ? 19 : \
- ((worldVersion) <= 3837) ? 20 : \
+ ((worldVersion) <= 3839) ? 20 : \
21)
diff --git a/Win/nbt.cpp b/Win/nbt.cpp
index 841d5b0..46b11ea 100644
--- a/Win/nbt.cpp
+++ b/Win/nbt.cpp
@@ -4035,8 +4035,9 @@ static int readPalette(int& returnCode, bfFile* pbf, int mcVersion, unsigned cha
dataVal |= atoi(value);
}
- // for the chiseled bookshelf, just mark the low bit with a 1 if there is any occupied book slot.
- // direction is in 0x7 field
+ // for the chiseled bookshelf, just mark the 0x8 bit with a 1 if there is any occupied book slot.
+ // We do not differentiate how many books.
+ // Direction is in 0x7 field
else if (strcmp(token, "slot_0_occupied") == 0 ||
strcmp(token, "slot_1_occupied") == 0 ||
strcmp(token, "slot_2_occupied") == 0 ||
diff --git a/Win/terrainExtData.cpp b/Win/terrainExtData.cpp
index 38ae434..688510c 100644
--- a/Win/terrainExtData.cpp
+++ b/Win/terrainExtData.cpp
@@ -67644,10 +67644,10 @@ unsigned char gTerrainExt[] = {
118,119,111,255, 118,119,111,255, 133,131,122,255, 133,131,122,255,
133,131,122,255, 118,119,111,255, 118,119,111,255, 118,119,111,255,
133,131,122,255, 133,131,122,255, 133,131,122,255, 118,119,111,255,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+204,166,108,255, 204,166,108,255, 204,166,108,255, 179,140,81,255,
+179,140,81,255, 204,166,108,255, 204,166,108,255, 204,166,108,255,
+204,166,108,255, 204,166,108,255, 159,132,77,255, 159,132,77,255,
+159,132,77,255, 179,140,81,255, 179,140,81,255, 159,132,77,255,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -67708,10 +67708,10 @@ unsigned char gTerrainExt[] = {
91,98,94,255, 91,98,94,255, 91,98,94,255, 91,98,94,255,
91,98,94,255, 91,98,94,255, 91,98,94,255, 91,98,94,255,
91,98,94,255, 99,108,109,255, 118,119,111,255, 118,119,111,255,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+159,132,77,255, 25,19,10,255, 25,19,10,255, 25,19,10,255,
+25,19,10,255, 25,19,10,255, 64,97,31,255, 64,97,31,255,
+50,79,23,255, 50,79,23,255, 25,19,10,255, 75,31,103,255,
+75,31,103,255, 53,28,70,255, 53,28,70,255, 124,98,62,255,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -67772,10 +67772,10 @@ unsigned char gTerrainExt[] = {
75,81,69,255, 75,81,69,255, 75,81,69,255, 75,81,69,255,
75,81,69,255, 82,90,81,255, 75,81,69,255, 82,90,81,255,
82,90,81,255, 108,113,107,255, 108,113,107,255, 133,131,122,255,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+188,152,98,255, 15,82,82,255, 22,133,133,255, 16,97,97,255,
+15,82,82,255, 25,19,10,255, 64,97,31,255, 87,133,42,255,
+64,97,31,255, 50,79,23,255, 25,19,10,255, 142,59,194,255,
+167,67,229,255, 103,43,142,255, 73,38,95,255, 124,98,62,255,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -67836,10 +67836,10 @@ unsigned char gTerrainExt[] = {
75,81,69,255, 75,81,69,255, 75,81,69,255, 75,81,69,255,
75,81,69,255, 75,81,69,255, 82,90,81,255, 82,90,81,255,
118,119,111,255, 133,131,122,255, 99,108,109,255, 118,119,111,255,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+179,140,81,255, 16,97,97,255, 34,148,148,255, 16,97,97,255,
+15,82,82,255, 78,58,30,255, 87,133,42,255, 107,158,58,255,
+64,97,31,255, 50,79,23,255, 78,58,30,255, 103,43,142,255,
+122,49,167,255, 75,31,103,255, 53,28,70,255, 155,119,66,255,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -67900,10 +67900,10 @@ unsigned char gTerrainExt[] = {
133,131,122,255, 133,131,122,255, 118,119,111,255, 108,113,107,255,
118,119,111,255, 118,119,111,255, 108,113,107,255, 108,113,107,255,
133,131,122,255, 133,131,122,255, 99,108,109,255, 133,131,122,255,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+179,140,81,255, 145,51,20,255, 242,201,88,255, 195,143,0,255,
+106,37,15,255, 78,58,30,255, 195,143,0,255, 242,201,88,255,
+195,143,0,255, 133,98,0,255, 78,58,30,255, 103,43,142,255,
+122,49,167,255, 75,31,103,255, 53,28,70,255, 155,119,66,255,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -67964,10 +67964,10 @@ unsigned char gTerrainExt[] = {
108,113,107,255, 99,108,109,255, 108,113,107,255, 118,119,111,255,
118,119,111,255, 118,119,111,255, 108,113,107,255, 108,113,107,255,
145,142,128,255, 133,131,122,255, 99,108,109,255, 133,131,122,255,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+179,140,81,255, 106,37,15,255, 195,143,0,255, 133,98,0,255,
+106,37,15,255, 25,19,10,255, 87,133,42,255, 107,158,58,255,
+64,97,31,255, 50,79,23,255, 25,19,10,255, 142,59,194,255,
+167,67,229,255, 103,43,142,255, 73,38,95,255, 155,119,66,255,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -68028,10 +68028,10 @@ unsigned char gTerrainExt[] = {
99,108,109,255, 108,113,107,255, 118,119,111,255, 118,119,111,255,
118,119,111,255, 108,113,107,255, 108,113,107,255, 108,113,107,255,
145,142,128,255, 133,131,122,255, 99,108,109,255, 133,131,122,255,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+124,98,62,255, 16,97,97,255, 22,133,133,255, 16,97,97,255,
+15,82,82,255, 25,19,10,255, 64,97,31,255, 87,133,42,255,
+64,97,31,255, 50,79,23,255, 25,19,10,255, 103,43,142,255,
+122,49,167,255, 75,31,103,255, 53,28,70,255, 124,98,62,255,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -68092,10 +68092,10 @@ unsigned char gTerrainExt[] = {
108,113,107,255, 118,119,111,255, 118,119,111,255, 118,119,111,255,
108,113,107,255, 108,113,107,255, 108,113,107,255, 99,108,109,255,
145,142,128,255, 145,142,128,255, 99,108,109,255, 118,119,111,255,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+188,152,98,255, 179,140,81,255, 179,140,81,255, 188,152,98,255,
+188,152,98,255, 204,166,108,255, 204,166,108,255, 204,166,108,255,
+188,152,98,255, 188,152,98,255, 188,152,98,255, 179,140,81,255,
+179,140,81,255, 159,132,77,255, 159,132,77,255, 159,132,77,255,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -68156,10 +68156,10 @@ unsigned char gTerrainExt[] = {
118,119,111,255, 118,119,111,255, 118,119,111,255, 108,113,107,255,
108,113,107,255, 108,113,107,255, 99,108,109,255, 99,108,109,255,
145,142,128,255, 145,142,128,255, 99,108,109,255, 133,131,122,255,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+179,140,81,255, 179,140,81,255, 155,119,66,255, 155,119,66,255,
+159,132,77,255, 159,132,77,255, 159,132,77,255, 179,140,81,255,
+179,140,81,255, 159,132,77,255, 159,132,77,255, 159,132,77,255,
+155,119,66,255, 155,119,66,255, 155,119,66,255, 155,119,66,255,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -68220,10 +68220,10 @@ unsigned char gTerrainExt[] = {
118,119,111,255, 118,119,111,255, 108,113,107,255, 108,113,107,255,
108,113,107,255, 99,108,109,255, 99,108,109,255, 108,113,107,255,
145,142,128,255, 145,142,128,255, 99,108,109,255, 133,131,122,255,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+155,119,66,255, 128,42,65,255, 145,47,73,255, 128,42,65,255,
+128,42,65,255, 25,19,10,255, 25,19,10,255, 25,19,10,255,
+25,19,10,255, 25,19,10,255, 25,19,10,255, 23,57,106,255,
+23,57,106,255, 15,46,93,255, 15,46,93,255, 124,98,62,255,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -68284,10 +68284,10 @@ unsigned char gTerrainExt[] = {
118,119,111,255, 108,113,107,255, 108,113,107,255, 108,113,107,255,
99,108,109,255, 99,108,109,255, 108,113,107,255, 118,119,111,255,
145,142,128,255, 145,142,128,255, 108,113,107,255, 133,131,122,255,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+204,166,108,255, 128,42,65,255, 182,60,92,255, 145,47,73,255,
+128,42,65,255, 25,19,10,255, 173,97,70,255, 187,111,84,255,
+126,70,51,255, 107,60,43,255, 25,19,10,255, 32,77,145,255,
+39,89,165,255, 23,57,106,255, 15,46,93,255, 155,119,66,255,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -68348,10 +68348,10 @@ unsigned char gTerrainExt[] = {
108,113,107,255, 108,113,107,255, 108,113,107,255, 99,108,109,255,
99,108,109,255, 108,113,107,255, 118,119,111,255, 118,119,111,255,
145,142,128,255, 145,142,128,255, 108,113,107,255, 133,131,122,255,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+204,166,108,255, 195,143,0,255, 242,201,88,255, 195,143,0,255,
+133,98,0,255, 78,58,30,255, 173,97,70,255, 187,111,84,255,
+126,70,51,255, 107,60,43,255, 78,58,30,255, 145,51,20,255,
+242,201,88,255, 195,143,0,255, 106,37,15,255, 179,140,81,255,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -68412,10 +68412,10 @@ unsigned char gTerrainExt[] = {
118,119,111,255, 118,119,111,255, 133,131,122,255, 133,131,122,255,
133,131,122,255, 133,131,122,255, 133,131,122,255, 133,131,122,255,
145,142,128,255, 145,142,128,255, 108,113,107,255, 118,119,111,255,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+179,140,81,255, 182,60,92,255, 212,74,110,255, 182,60,92,255,
+128,42,65,255, 78,58,30,255, 195,143,0,255, 242,201,88,255,
+195,143,0,255, 133,98,0,255, 78,58,30,255, 106,37,15,255,
+195,143,0,255, 133,98,0,255, 106,37,15,255, 179,140,81,255,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -68476,10 +68476,10 @@ unsigned char gTerrainExt[] = {
118,119,111,255, 133,131,122,255, 118,119,111,255, 133,131,122,255,
133,131,122,255, 133,131,122,255, 133,131,122,255, 133,131,122,255,
133,131,122,255, 145,142,128,255, 108,113,107,255, 118,119,111,255,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+179,140,81,255, 182,60,92,255, 212,74,110,255, 182,60,92,255,
+128,42,65,255, 25,19,10,255, 173,97,70,255, 187,111,84,255,
+126,70,51,255, 107,60,43,255, 25,19,10,255, 32,77,145,255,
+39,89,165,255, 23,57,106,255, 15,46,93,255, 179,140,81,255,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -68540,10 +68540,10 @@ unsigned char gTerrainExt[] = {
99,108,109,255, 99,108,109,255, 99,108,109,255, 99,108,109,255,
108,113,107,255, 99,108,109,255, 108,113,107,255, 108,113,107,255,
108,113,107,255, 108,113,107,255, 118,119,111,255, 118,119,111,255,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+159,132,77,255, 145,47,73,255, 182,60,92,255, 145,47,73,255,
+128,42,65,255, 25,19,10,255, 126,70,51,255, 173,97,70,255,
+126,70,51,255, 107,60,43,255, 25,19,10,255, 23,57,106,255,
+32,77,145,255, 23,57,106,255, 15,46,93,255, 155,119,66,255,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -68604,10 +68604,10 @@ unsigned char gTerrainExt[] = {
133,131,122,255, 118,119,111,255, 118,119,111,255, 118,119,111,255,
133,131,122,255, 133,131,122,255, 118,119,111,255, 118,119,111,255,
133,131,122,255, 133,131,122,255, 118,119,111,255, 133,131,122,255,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+179,140,81,255, 188,152,98,255, 188,152,98,255, 204,166,108,255,
+204,166,108,255, 204,166,108,255, 188,152,98,255, 179,140,81,255,
+179,140,81,255, 188,152,98,255, 188,152,98,255, 188,152,98,255,
+188,152,98,255, 155,119,66,255, 179,140,81,255, 179,140,81,255,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
diff --git a/Win/tiles.h b/Win/tiles.h
index 55d7e9b..4c5bc20 100644
--- a/Win/tiles.h
+++ b/Win/tiles.h
@@ -1154,7 +1154,7 @@ static struct {
{ 11, 66, 388, 0, L"chiseled_tuff_top", L"", SWATCH_REPEAT_ALL },
{ 12, 66, 388, 0, L"chiseled_tuff_bricks", L"", SWATCH_REPEAT_ALL },
{ 13, 66, 388, 0, L"chiseled_tuff_bricks_top", L"", SWATCH_REPEAT_ALL },
- { 14, 66, 0, 0, L"", L"", SWATCH_REPEAT_ALL },
+ { 14, 66, 47, 0, L"chiseled_bookshelf_occupied", L"", SWATCH_REPEAT_ALL }, // d'oh, accidentally deleted this one when adding 1.21
{ 15, 66, 0, 0, L"", L"", SWATCH_REPEAT_ALL },
/* Template for future additions - copy and paste in Notepad++ to avoid it getting rejiggered, and keep inside comment marks to
* avoid rejiggering (spaces getting removed) by keeping it inside the comment marks when pasting back here:
diff --git a/docs/index.html b/docs/index.html
index 2ca3dae..6bda370 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -72,7 +72,7 @@
-
Download Mineways 12.00 for Windows. The full download includes eight converted resource packs (211 Mb), or download the Mineways minimal version, which consists of just the program without any documentation, resource textures, scripting, etc. (3 Mb) - it may be all you need. Also available: Mineways 10.02 localized to Chinese by Catmelon; code repo here Problems? Get help here.
+
Download Mineways 12.01 for Windows. The full download includes four converted resource packs (245 Mb), or download the Mineways minimal version, which consists of just the program without any documentation, resource textures, scripting, etc. (3 Mb) - it may be all you need. Also available: Mineways 10.02 localized to Chinese by Catmelon; code repo here Problems? Get help here.
Mineways lets you export your creations from Minecraft: Java Edition, versions 1.20 and earlier, into 3D files you can use for making images, movies, or 3D prints. Are you using a Bedrock Edition of Minecraft? You can convert your world so that Mineways can read it.
@@ -171,7 +171,7 @@
diff --git a/docs/mineways.html b/docs/mineways.html
index 001233e..5940b71 100644
--- a/docs/mineways.html
+++ b/docs/mineways.html
@@ -2882,6 +2882,14 @@ Version History
From newest to oldest. The very newest is sometimes unreleased work in progress, with "*" meaning "to do" and "**" meaning "stretch goal."
+- Version 12.01, 7/17/2024 - exe, source.
+
+
+ - Bug fix: I accidently removed the tile "chiseled_bookshelf_occupied" when updating to 12.00. Fixed, so chiseled bookshelves with books now properly show that again. TileMaker updated to 3.24 and ChannelMixer to 1.17. (thanks to Boranium for the bug report)
+
- Bug fix: buttons reduced to be 6 pixels wide instead of 7. (thanks to Boranium for the bug report)
+
- Data version numbers now properly interpreted and set for 1.21 block test world.
+
- All terrain files regenerated, LunaHD missing chiseled tiles fixed.
+
- Version 12.00, 6/21/2024 - exe, source.
@@ -4238,7 +4246,7 @@