CHANGELOG.md

@@ -14,5 +14,4 @@
 - Added Troika parser (Moscow, Russia)
 - Added Myki parser (Melbourne (and surrounds), VIC, Australia)
 - Added Opal parser (Sydney (and surrounds), NSW, Australia)
-- Added ITSO parser (United Kingdom)
->>>>>>>>> Temporary merge branch 2
+- Added ITSO parser (United Kingdom)

README.md

@@ -27,18 +27,6 @@ This is a list of metro cards and transit systems that need support or have part
   - Status: Fully supported.
 - [x] **Opal**
   - Status: Fully supported.
->>>>>>>>> Temporary merge branch 2
-
-## 📝 To Do (Unimplemented)
-- [ ] **Tianjin Railway Transit (TRT)**  
-  - To Do: Add support for reading and analyzing Tianjin Railway Transit cards.
-<<<<<<<<< Temporary merge branch 1
-- [ ] **Clipper**  
-  - To Do: Add support for reading and analyzing Clipper cards. (v0.3)
-=========
-
->>>>>>>>> Temporary merge branch 2
-
 
 ---
 

manifest.yml

@@ -17,4 +17,4 @@ sourcecode:
     origin: https://github.com/luu176/Metroflip
     subdir:
   type: git
-version: 0.2
+version: 0.3

scenes/metroflip_scene_credits.c

@@ -17,10 +17,16 @@ void metroflip_scene_credits_on_enter(void* context) {
     furi_string_cat_printf(str, "Inspired by Metrodroid\n\n");
     furi_string_cat_printf(str, "\e#Parser Credits:\n\n");
     furi_string_cat_printf(str, "Rav-Kav Parser: luu176\n\n");
+    furi_string_cat_printf(str, "Navigo Parser: luu176\n\n");
     furi_string_cat_printf(str, "Metromoney Parser:\n Leptopt1los\n\n");
     furi_string_cat_printf(str, "Bip! Parser:\n rbasoalto, gornekich\n\n");
     furi_string_cat_printf(str, "CharlieCard Parser:\n zacharyweiss\n\n");
-    furi_string_cat_printf(str, "Info Slave: equip\n\n");
+    furi_string_cat_printf(str, "Clipper Parser:\n ke6jjj\n\n");
+    furi_string_cat_printf(str, "Troika Parser:\n gornekich\n\n");
+    furi_string_cat_printf(str, "ITSO Parser:\n gsp8181, hedger, gornekich\n\n");
+    furi_string_cat_printf(str, "Opal Parser:\n gornekich\n\n");
+    furi_string_cat_printf(str, "Myki Parser:\n gornekich\n\n");
+    furi_string_cat_printf(str, "Info Slaves:\n Equip, TheDingo8MyBaby\n\n");
 
     widget_add_text_scroll_element(widget, 0, 0, 128, 64, furi_string_get_cstr(str));