Merge branch 'master' of https://bibbitgit.duckdns.org/melancholytron/qmutants into BradDev

login.txt

@@ -1,3 +1,4 @@
+telnet.goldenunicorn.net,True
 epilectrik,gupass,4,Nuclear-Decay,dispell,True,True,True,False,True,False,2500,3800,50
 im bait,gupass,4,Nuclear-Decay,dispell,True,True,True,False,True,False,2500,3800,50
 doctor,gupass,2,Nuclear-Decay,cure poison,True,True,True,False,True,False,2000,2500,50

mtron-login.txt

@@ -1,3 +1,4 @@
+telnet.goldenunicorn.net,True
 Mtron,gupass,4,Nuclear-Decay,dispell,True,True,True,True,True,False,2000,2500,50
 IonJunkies-Merc,gupass,4,Nuclear-Decay,dispell,True,True,True,True,True,False,2000,2500,50
 Ionjunkies-priest-1,gupass,2,Nuclear-Decay,cure poison,True,True,True,False,True,False,2000,2500,50  

qmutants.py

@@ -114,7 +114,7 @@ farm_sell_list = ["Gold-Chunck","Nuclear-Rock","Nuclear-Waste"]
 
 farm_stock_list = ["Nuclear-Decay","Eazy-Armor","Hell-Blade"]
 
-friend_list = ["Epilectrik","ImBait","Mtron","Im","IonJunkies-Merc","Robin-Hood","Doctor","Assassin","Mercenary","Mutant-warrior-1","Mutant-warrior-2","CarlRam","tkls-Warrior","tkls-Warrior2","tkls-Wizard1","tkls-Priest"]
+friend_list = ["Epilectrik","ImBait","Mtron","Im","IonJunkies-Merc","Robin-Hood","Doctor","Assassin","Mercenary","Mutant-warrior-1","Mutant-warrior-2","CarlRam","tkls-Warrior","tkls-Warrior2","tkls-Priest","tkls-Wizard1"]
 
 #cure_path = ["done","tra 2000","north","north","north","north","cure me","!return","done"]
 
@@ -1821,12 +1821,15 @@ class MainWindow(QMainWindow):
         self.layout.addLayout(hbox1)
     
     def setup_mqtt(self):
-        if MQTT_ENABLED:
-            broker_address="192.168.86.27" 
-            #print("creating new instance")
-            self.client = mqtt.Client("P1") #create new instance
-            self.client.username_pw_set("homeassistant", "oes5gohng9gau1Quei2ohpixashi4Thidoon1shohGai2mae0ru2zaph2vooshai")
-            self.client.connect(broker_address)  
+        try:
+            if MQTT_ENABLED:
+                broker_address="192.168.86.27" 
+                #print("creating new instance")
+                self.client = mqtt.Client("P1") #create new instance
+                self.client.username_pw_set("homeassistant", "oes5gohng9gau1Quei2ohpixashi4Thidoon1shohGai2mae0ru2zaph2vooshai")
+                self.client.connect(broker_address)  
+        except:
+            pass
             
     #Send mqtt with talking
     def send_mqtt(self,out_str):