Merge branch 'master' of https://github.com/wofsauge/External-Item-Descriptions into master

main.lua

@@ -595,7 +595,7 @@ local function renderAchievementInfo()
 			demoDescObj.Description = EID:getDescriptionEntry("OldGameVersionWarningText") or ""
 			EID:displayPermanentText(demoDescObj)
 			hasShownAchievementWarning = true
-		elseif EID.player:HasCollectible(710) and EID:DetectModdedItems() and EID.Config.DisplayBagOfCrafting ~= "never" and not EID.Config.BagOfCraftingSimplifiedMode then
+		elseif EID.player:HasCollectible(710) and EID:DetectModdedItems() and EID.Config.DisplayBagOfCrafting ~= "never" and EID.Config.BagOfCraftingDisplayMode ~= "No Recipes" then
 			local demoDescObj = EID:getDescriptionObj(-999, -1, 1)
 			demoDescObj.Name = EID:getDescriptionEntry("AchievementWarningTitle") or ""
 			demoDescObj.Description = EID:getDescriptionEntry("ModdedRecipesWarningText") or ""
@@ -639,13 +639,12 @@ local function onRender(t)
 		EID.isHidden = not EID.isHidden
 	end
 	
-	if ModConfigMenu and ModConfigMenu.IsVisible and ModConfigMenu.Config["Mod Config Menu"].HideHudInMenu and EID.MCMCompat_isDisplayingEIDTab ~= "Visuals" then --if if the mod config menu exists, is opened and Hide Hud is enabled, and ModConfigMenu is currently in the "Visuals" tab of EID
+	if ModConfigMenu and ModConfigMenu.IsVisible and ModConfigMenu.Config["Mod Config Menu"].HideHudInMenu and EID.MCMCompat_isDisplayingEIDTab ~= "Visuals" and EID.MCMCompat_isDisplayingEIDTab ~= "Crafting" then --if the mod config menu exists, is opened and Hide Hud is enabled, and ModConfigMenu isn't currently in the "Visuals" or "Crafting" tab of EID
 		return
 	end
 	
-	EID:renderMCMDummyDescription()
-	
 	renderAchievementInfo()
+	EID:renderMCMDummyDescription()
 
 	if EID.GameVersion == "ab+" then
 		if EID.player:HasCollectible(CollectibleType.COLLECTIBLE_SCHOOLBAG) then
@@ -659,12 +658,6 @@ local function onRender(t)
 		else
 			EID:removeTextPosModifier("Tained HUD")
 		end
-		if EID.player:HasCollectible(710) then
-			local success = EID:handleBagOfCraftingRendering()
-			if success then
-				return
-			end
-		end
 	end
 	
 	if EID.isHidden then
@@ -681,6 +674,13 @@ local function onRender(t)
 		return
 	end
 	
+	if REPENTANCE and EID.player:HasCollectible(710) then
+		local success = EID:handleBagOfCraftingRendering()
+		if success then
+			return
+		end
+	end
+	
 	EID.lastDescriptionEntity = nil
 	EID.lastDist = 10000
 	local searchGroups = {}