From ea79ac1366dee3d1c06d0faae6be1c6741cad13f Mon Sep 17 00:00:00 2001
From: "andrea.villa" <andrea.villa@egalware.com>
Date: Wed, 22 Apr 2026 12:11:35 +0200
Subject: [PATCH 1/2] Tutte le forature vengono ordinate per diametro
 decrescente

---
 LuaLibs/WallExec.lua | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/LuaLibs/WallExec.lua b/LuaLibs/WallExec.lua
index 6217c26..0aad1d4 100644
--- a/LuaLibs/WallExec.lua
+++ b/LuaLibs/WallExec.lua
@@ -525,10 +525,8 @@ local function SortMach( nPhase, PrevMch, nPartId, nType, StartNames, bExistName
       if EgtGetOperationPhase( nOperId) == nPhase  and  ( nType & nOperType) == nOperType and
          ( not nPartId or EgtGetInfo( nOperId, 'Part', 'i') == nPartId) and
          ( not nPriority or EgtGetInfo( nOperId, 'PRIORITY', 'i') == nPriority ) and
-         ( not StartNames or ( bExistName and ContainsStartName( nOperId, StartNames)) or
-           ( not bExistName and not ContainsStartName( nOperId, StartNames))) and
-         ( not sInfo  or ( bExistInfo and EgtGetInfo( nOperId, sInfo, 'i') == 1) or
-           ( not bExistInfo and EgtGetInfo( nOperId, sInfo, 'i') ~= 1)) then
+         ( not StartNames or ( bExistName and ContainsStartName( nOperId, StartNames)) or ( not bExistName and not ContainsStartName( nOperId, StartNames))) and
+         ( not sInfo  or ( bExistInfo and EgtGetInfo( nOperId, sInfo, 'i') == 1) or ( not bExistInfo and EgtGetInfo( nOperId, sInfo, 'i') ~= 1)) then
          -- non si deve cambiare lo stato di attivazione della lavorazione (se disabilitata errata)
          EgtSetCurrMachining( nOperId)
          if not EgtIsMachiningEmpty() then
@@ -652,8 +650,8 @@ local function SortMachinings( nPhase, PrevMch, nPartId, nPriority)
    PrevMch = SortMach( nPhase, PrevMch, nPartId, MCH_OY.POCKETING, { 'PreDrill_'}, true, nil, nil, nil, nil, nil, nPriority)
    -- Forature e Svuotature
    PrevMch = SortMach( nPhase, PrevMch, nPartId, MCH_OY.DRILLING + MCH_OY.POCKETING + MCH_OY.MILLING, { 'SideMill_', 'Clean_'}, false, 'MOVE_AFTER', false, false, true, nil, nPriority)
---   -- Forature  ***
---   PrevMch = SortMach( nPhase, PrevMch, nPartId, MCH_OY.DRILLING, nil, nil, 'MOVE_AFTER', false)
+   -- Forature  ***
+   PrevMch = SortMach( nPhase, PrevMch, nPartId, MCH_OY.DRILLING, nil, nil, nil, false, nil, true, nil, nil)
 --   -- Svuotature  ***
 --   PrevMch = SortMach( nPhase, PrevMch, nPartId, MCH_OY.POCKETING, nil, nil, 'MOVE_AFTER', false)
 --   -- Fresature che sono rifiniture di spigoli

From cfaa30d55ce81ca9f4248bef2dc5ee9e5fd53b6f Mon Sep 17 00:00:00 2001
From: "andrea.villa" <andrea.villa@egalware.com>
Date: Thu, 23 Apr 2026 12:26:31 +0200
Subject: [PATCH 2/2] Update Log e Version

---
 UpdateLog.txt | 3 +++
 Version.lua   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/UpdateLog.txt b/UpdateLog.txt
index fb7d992..54ff533 100644
--- a/UpdateLog.txt
+++ b/UpdateLog.txt
@@ -1,5 +1,8 @@
            ==== Wall Update Log ====
 
+Versione 3.1d2 (23/04/2026)
+- Modif : Tutte le forature vengono ordinate per diametro decrescente
+
 Versione 3.1d1 (08/04/2026)
 - Modif : in LapJoint, svuotature, l'uscita dalla geometria viene limitata della massima quantità che non rovina il pezzo vicino
 - Fixed : correzione per chiodature
diff --git a/Version.lua b/Version.lua
index 1d2a7f7..7ce6cc3 100644
--- a/Version.lua
+++ b/Version.lua
@@ -2,5 +2,5 @@
 -- Gestione della versione di Wall
 
 NAME = 'Wall'
-VERSION = '3.1d1'
+VERSION = '3.1d2'
 MIN_EXE = '3.1c1'