Merge branch 'main' of https://github.com/makayla-moster/HammerBot

makayla-moster · Nov 29, 2023 · e0a0f99 · e0a0f99
2 parents 542b148 + fdd4310
commit e0a0f99
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/TechTreeProcessing/techtree.py b/TechTreeProcessing/techtree.py
@@ -101,6 +101,6 @@
 unique_techs["castle_age_unique_techs"] = castle_age_unique_techs
 unique_techs["imperial_age_unique_techs"] = imperial_age_unique_techs
 
-with open('unique_techs.json', 'w') as json_file:
+with open("unique_techs.json", "w") as json_file:
     json.dump(unique_techs, json_file)
 # print(master_dict)
diff --git a/cog_modules/stats/cog.py b/cog_modules/stats/cog.py
@@ -18,12 +18,13 @@
 with open("descriptions_cleaned.json") as fp:
     descriptions = json.load(fp)
 
-#<<<<<<< Updated upstream
-#=======
+# <<<<<<< Updated upstream
+# =======
 # Load the unique_techs.json file as unique_techs
 with open("unique_techs.json") as fp:
     unique_techs = json.load(fp)
-#>>>>>>> Stashed changes
+# >>>>>>> Stashed changes
+
 
 class StatCommands(commands.Cog):
     """Commands for stat commands."""

diff --git a/gizmopics.py b/gizmopics.py
@@ -232,7 +232,7 @@
     "https://cdn.discordapp.com/attachments/1105932220838989834/1170520936299114606/IMG_5331.jpg?ex=65595792&is=6546e292&hm=9fe6b61ef894effecc05020d8ef3a9e7499259b3498058699f4f4b917b711936&",
     "https://cdn.discordapp.com/attachments/1105932220838989834/1170520937175728128/IMG_5320.jpg?ex=65595792&is=6546e292&hm=6b95c2f2632c419a0e5661858711424f6271c491f29cca27663df130afdaecb0&",
     "https://cdn.discordapp.com/attachments/1105932220838989834/1170743875409817781/IMG_5443.jpg?ex=655a2733&is=6547b233&hm=5286ff6dfe017a7fe36cc1fce24011504676104a5e25b05ab26929f453d8a251&",
-    "https://cdn.discordapp.com/attachments/1105932220838989834/1170743876387078277/IMG_5447.jpg?ex=655a2733&is=6547b233&hm=47e02054a65c7f3e7e568a69bf00b1cddd718b2a4a21d3d1f92189635420d84f&"
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1170743876387078277/IMG_5447.jpg?ex=655a2733&is=6547b233&hm=47e02054a65c7f3e7e568a69bf00b1cddd718b2a4a21d3d1f92189635420d84f&",
 ]
 
 taoPics = [