diff --git a/games.csv b/games.csv
index 3b78bfc624983279a473e3eed34e426622bd2d9c..b7ac98f4945e1dd266195dd36153e9279dfe4a4a 100644
--- a/games.csv
+++ b/games.csv
@@ -1,3 +1,51 @@
+<<<<<<< HEAD
+name,reporter,verified,repository,website,more information,license,category,summary,summary source,description,description source,screenshots,mobile compatibility,framework,backend,service,appid,scale-to-fit,notice,flatpak,aur,postmarketos,debian
+1010! Klooni,LINMOB,FALSE,https://github.com/LonamiWebs/Klooni1010,https://lonamiwebs.github.io/klooni/,,GNU GPLv3,game,"""libGDX game based on the original 1010!""",https://github.com/LonamiWebs/Klooni1010,,,https://f-droid.org/de/packages/io.github.lonamiwebs.klooni/,A,libGDX,,,dev.lonami.klooni,,,,,,
+Apple Flinger,LINMOB,FALSE,https://gitlab.com/ar-/apple-flinger,,,GNU GPLv3,game,"""Funny single- and multiplayer game for Android - Use a slingshot to shoot with apples. Very challenging and addictive.""",https://gitlab.com/ar-/apple-flinger,,,,A,libGDX,,,com.gitlab.ardash.appleflinger,,,,,,
+Arkade,LINMOB,FALSE,https://invent.kde.org/games/arkade,,,"GNU GPLv3, BSD 2 Clause",game launcher,"""Collection of Arcade games developed in Kirigami""",https://invent.kde.org/games/arkade,,,,5,Kirigami,,,org.kde.gamecenter,,,,,,
+BurgerParty,LINMOB,FALSE,https://github.com/agateau/burgerparty,http://agateau.com/projects/burgerparty/,,CC BY-Sa,game,"""A time management game for Android where you play a fast-food owner who must put together the burgers ordered by her customers before time runs out. """,https://github.com/agateau/burgerparty,,,agateau.com/projects/burgerparty/,A,libGDX,,,com.agateau.burgerparty,,,,,,
+Caramelos,LINMOB,FALSE,https://github.com/luarca84/Caramelos,,,MIT,game,"""Caramelos is an Android Game made with Libgdx """,https://github.com/luarca84/Caramelos,,,https://play.google.com/store/apps/details?id=com.dfzlv.gjjlt.caramelos,,,,,com.dfzlv.gjjlt.caramelos,,,,,,
+Endless Sky,-Euso-,FALSE,https://github.com/endless-sky/endless-sky,https://endless-sky.github.io/,,GPLv3,game,“2D space trading and combat game similar to the classic Escape Velocity series.”,,,,,1,,,,,,,,,,
+Flappy-gnome,LINMOB,FALSE,https://gitlab.gnome.org/albfan/flappy-gnome-tutorial,,,not specified,game,"""Flappy GNOME is a side-scrolling game development tutorial using Vala and GTK+.""",https://gitlab.gnome.org/albfan/flappy-gnome-tutorial,,,https://gitlab.gnome.org/albfan/flappy-gnome-tutorial,,GTK,,,org.gnome.Flappy,,,,,,
+FreeOrion,-Euso-,FALSE,https://github.com/freeorion/freeorion,https://freeorion.org/index.php/Main_Page,,GPLv2,game,“Turn-based space empire and galactic conquest game.”,,,,,1,,,,,,,,,,
+Gcompris,skyrrd,FALSE,https://github.com/gcompris/GCompris-qt,https://www.gcompris.net,,GPLv3,,,,,,,5,,,,,,,,,,
+Gnome 2048,Moxvallix,TRUE,https://gitlab.gnome.org/GNOME/gnome-2048,https://wiki.gnome.org/Apps/2048,,GPLv3,game,"“The classic 2048 puzzle game, made for GNOME”",,,,,5,GTK,,,,,,,,,
+Gnome Chess,Moxvallix,TRUE,https://gitlab.gnome.org/GNOME/gnome-chess,https://wiki.gnome.org/Apps/Chess,,GPLv3,game,“Chess for GNOME”,,,,,5,GTK,,,,,,,,,
+GNU Chess,Based_Commgnunism ,TRUE,https://ftp.gnu.org/gnu/chess/,https://www.gnu.org/software/chess/,,GPLv3,game,"“GNU Chess is a chess-playing program. It can be used to play chess against the computer on a terminal or, more commonly, as a chess engine for graphical chess frontends such as Xboard.”",,,,,5,,,,,,,,,,
+GzDoom,-Euso-,FALSE,https://github.com/coelckers/gzdoom,https://www.zdoom.org/downloads,,GPLv3,game,“ZDoom is a family of enhanced ports of the Doom engine.”,,,,,1,,,,,,,,,,
+H-Craft,LINMOB,FALSE,https://github.com/mzeilfelder/hc1,http://www.irrgheist.com/games.htm,,"z-lib and others, graphics and fonts are not free licensed!",game,"""H-Craft Championship is a fun to play scifi-racer.""",http://www.irrgheist.com/games.htm,,,http://www.irrgheist.com/hcraftscreenshots.htm https://play.google.com/store/apps/details?id=com.irrgheist.hcraft_championship,,,,,,,,,,,
+Half Life,-Euso-,FALSE,https://github.com/ValveSoftware/halflife,https://half-life.fandom.com/wiki/Half-Life,,Proprietary,game,“Sci-fi first-person shooter developed and published by Valve.”,,,,,1,,,,,,,,,,
+Ironball,LINMOB,FALSE,https://github.com/pracedru/ironball,https://www.pracedru.dk:8888/index.html,,GNU GPLv3,game,""" Mobile game inspired by the classic Speedball game for Amiga/C64 etc.",https://github.com/pracedru/ironball/,,,https://github.com/pracedru/ironball/,5,Web technologies,,,,,,,,,
+Kolorfill,LINMOB,FALSE,https://invent.kde.org/games/kolorfill,,https://pusling.com/blog/?p=505,MIT/X11,game,"""It is a simple flood filling game written using the amazing Kirigami framework.""",https://pusling.com/blog/?p=555,,,https://pusling.com/blog/?p=505,5,"QtQuick, Kirigami",,,org.kde.kolorfill,,,,,,
+KTuberling,LINMOB,FALSE,https://invent.kde.org/games/ktuberling,,,GNU GPLv2,game,"""KTuberling is a simple constructor game suitable for children and adults alike """,https://anongit.kde.org/ktuberling.git,,,https://play.google.com/store/apps/details?id=org.kde.ktuberling,,,,,org.kde.ktuberling,,,,,,
+Lucy,LINMOB,FALSE,https://github.com/pabloalba/lucy/,,,Apache 2.0,game,"""Lucy's family has been abducted by Aliens! Help Lucy to reach the four UFOS and rescue her family.""",https://play.google.com/store/apps/details?id=es.seastorm.lucy,,,https://play.google.com/store/apps/details?id=es.seastorm.lucy,A,libGDX,,,es.seastorm.lucy,,,,,,
+Magarena,-Euso-,FALSE,https://github.com/magarena/magarena,https://magarena.github.io/,,GPLv3,game,“Single-player fantasy card game played against a computer opponent.”,,,,,1,,,,,,,,,,
+MartianRun,LINMOB,FALSE,https://github.com/wmora/martianrun,,,Apache-2.0,game,"""A 2D running game built with libGDX.""",https://github.com/wmora/martianrun,,,https://play.google.com/store/apps/details?id=com.gamestudio24.cityescape.android&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1,A,libGDX,,,com.gamestudio24.martianrun,,,,,,
+Minetest,LINMOB,FALSE,https://github.com/minetest/minetest,https://www.minetest.net/,,"different (CC BY-SA 3.0, GNU GPLv2.1and others)",game,"""Minetest, an open source infinite-world block sandbox game engine with support for survival and crafting.""",https://github.com/minetest/minetest#compiling,"“Once this pull request is merged, it will have touch screen support. https://github.com/minetest/minetest/pull/10729”",,,A,,,,net.minetest.Minetest,,,https://flathub.org/apps/details/net.minetest.Minetest,"minetest (repo), minetest-git",minetest,minetest
+Neverball,LINMOB,FALSE,https://github.com/pseuudonym404/neverball-touch,,,GNU GPLv2,game,"""Tilt the floor to roll a ball through an obstacle course within the given time. If the ball falls or time expires, a ball is lost.""",https://github.com/pseuudonym404/neverball-touch,,,,,,,,,,,,,,
+OpenMW,preflex,FALSE,https://gitlab.com/OpenMW/openmw,https://openmw.org/en/,,GPLv3,game,“Open source Morrowind implementation.”,,,,,1,,,,,,,,,,
+OpenRA,-Euso-,FALSE,https://github.com/OpenRA/OpenRA,https://www.openra.net/,,GPLv3,game,“OpenRA is a project that recreates and modernizes the classic Command & Conquer real time strategy games.”,,,,,1,,,,,,,,,,
+PixelWheels,LINMOB,FALSE,https://github.com/agateau/pixelwheels,http://agateau.com/projects/pixelwheels/,,CC BY-SA 4.0 International,game,"""Pixel Wheels is a top-down racing game for PC (Linux, Mac, Windows) and Android.""",http://agateau.com/projects/pixelwheels/,"""Race for the first place on various tracks. Pick up bonuses to boost your position or slow down competitors!""",http://agateau.com/projects/pixelwheels/,http://agateau.com/projects/pixelwheels/,A,libGDX,,,com.agateau.tinywheels.android,,,,,,
+Plasma Samegame,LINMOB,FALSE,https://invent.kde.org/plasma-mobile/plasma-samegame,,,GNU GPLv2,game,"""Samegame clone suitable for mobile devices""",https://invent.kde.org/plasma-mobile/plasma-samegame,,,https://linmob.net/2020/09/05/pinephone-building-plasma-mobile-apps-from-the-aur.html#plasma-samegame,5,Kirigami,,,org.kde.samegame,,,,,,
+Poland can into Space,LINMOB,FALSE,https://github.com/JSandomierz/pcis,,,!!! Not sure either it is a free software license (it is not allowed to generate revenue from the software): NPOSL-3.0,game,"""‘Poland can into Space’ is a simple Android game based on LibGDX framework""",https://github.com/JSandomierz/pcis,,,https://github.com/JSandomierz/pcis,,,,,pl.sanszo.pcis,,,,,,
+PrBoom,-Euso-,FALSE,https://sourceforge.net/projects/prboom/,http://prboom.sourceforge.net/,,GPLv2,game,“PrBoom is the culmination of years of work by various people and projects on the Doom source code.”,,,,,1,,,,,,,,,,
+Quicky in search of Mickey,LINMOB,FALSE,https://github.com/cyberbach/Adventure,,,not specified,game,"""In a beautiful magical forest magic live animals. Among them are our friends Quicky and Mickey. But once Mickey got lost. What happened to him? Quicky will have to find his brother and unravel the mysteries of the magic forest.""",https://play.google.com/store/apps/details?id=net.overmy.adventure,,,https://play.google.com/store/apps/details?id=net.overmy.adventure,A,libGDX,,,net.overmy.adventure,,,,,,
+Rabbit Escape,LINMOB,FALSE,https://github.com/andybalaam/rabbit-escape,https://artificialworlds.net/rabbit-escape,,GNU GPLv2,game,"""Android and PC game inspired by Lemmings and Pingus""",https://github.com/andybalaam/rabbit-escape,,,artificialworlds.net/rabbit-escape,,libGDX,,,net.artificialworlds.rabbitescape,,,,,,
+Rocket Guardian,LINMOB,FALSE,https://gitlab.com/atorresm/rocket-guardian,,,GNU GPLv3,game,"""Rocket Guardian is a android game about a guardian that must protect a city from the falling zombies.""",https://gitlab.com/atorresm/rocket-guardian,,,,,libGDX,,,atm.rocketguardian.RocketGuardian,,,,,,
+RuneLite,immychan,FALSE,https://github.com/runelite/runelite,https://runelite.net/,,BSD 2-Clause License,game,"“RuneLite is a free, open source OldSchool RuneScape client.”",https://github.com/runelite/runelite,"""RuneLite is a free, open source OldSchool RuneScape client.""",https://github.com/runelite/runelite,,1,,,,,,,,,,
+Save the bunny!,LINMOB,FALSE,https://github.com/pabloalba/savethebunny,,,Apache 2.0,game,"""Save the bunny! is a turn-based puzzle game.""",https://play.google.com/store/apps/details?id=es.seastorm.merlin,,,https://play.google.com/store/apps/details?id=es.seastorm.merlin,A,libGDX,,,es.seastorm.merlin,,,,,,
+Shattered Pixel Dungeon,Moxvallix,TRUE,https://github.com/moxvallix/shattered-pixel-dungeon-pinephone,https://shatteredpixel.com/,,GPLv3,game,"“A Roguelike RPG, with randomly generated levels, items, enemies, and traps!”",,“Forked by Moxvallix to allow it to run. Best in fullscreen mode. Needs java.”,,,5,libGDX,,,,,,,,,
+Superjumper,LINMOB,FALSE,https://github.com/libgdx/libgdx-demo-superjumper,,,not specified,"demo, game","""Super Jumper is a very simple Doodle Jump clone.""",https://github.com/libgdx/libgdx-demo-superjumper,,,https://github.com/libgdx/libgdx-demo-superjumper,,libGDX,,,com.badlogicgames.superjumper,,,,,,
+SuperTux,LINMOB,FALSE,https://github.com/SuperTux/supertux,https://www.supertux.org/,,GNU GPLv3,game,"""It features 28+ racetracks, a fresh design and unique driving physics.""",https://github.com/SuperTux/supertux,,,https://www.supertux.org/screenshots.html,,,,,org.supertuxproject.SuperTux,,,,,,
+SuperTuxKart,LINMOB,TRUE,https://github.com/supertuxkart/stk-code,https://supertuxkart.net/Main_Page,,"different (GNU GPLv3, CC-BY, CC BY-SA, Public Domain and others)",game,"""SuperTuxKart is a free kart racing game. It focuses on fun and not on realistic kart physics.""",https://github.com/supertuxkart/stk-code,,,https://play.google.com/store/apps/details?id=org.supertuxkart.stk,,,,,net.supertuxkart.SuperTuxKart,,,,,,
+Swooper,LINMOB,FALSE,https://invent.kde.org/luie/Swooper,,,not specified,game,"""Minesweeper for Plasma Mobile""",https://invent.kde.org/luie/Swooper,"""This is a simple Minesweeper implementation for Plasma Mobile!""",https://invent.kde.org/luie/Swooper,,5,Kirigami,,,org.kde.swooper,,,,,,
+Treasure,LINMOB,FALSE,https://source.puri.sm/david.boddie/treasure,,,GNU GPLv3,game,"""An application example, implementing a simple guessing game.""",https://source.puri.sm/david.boddie/treasure,,,,,"GTK, libhandy",,,sm.puri.treasure,,,,,,
+Tremelous,-Euso-,FALSE,https://github.com/darklegion/darklegion.github.io,https://tremulous.net/,,GPLv2,game,“Asymmetric team-based first-person shooter with real-time strategy elements.”,,,,,1,,,,,,,,,,
+TuxRacer,LINMOB,FALSE,https://github.com/pseuudonym404/tuxracer-touch,,,GNU GPLv2,game,"""Ubuntu touch tux racer port """,https://github.com/pseuudonym404/tuxracer-touch,,,https://uappexplorer.com/app/tuxracer.lb,,,,,,,,,,,
+TwoFun,LINMOB,FALSE,https://gitlab.com/tabos/twofun,https://tabos.gitlab.io/project/twofun/,,GNU GPLv3,game,"""Simple touch based game for two player""",https://tabos.gitlab.io/project/twofun/,,,https://tabos.gitlab.io/project/twofun/,,GTK,,,org.tabos.twofun,,,,,,
+Xash3D,-Euso-,FALSE,https://github.com/FWGS/xash3d-fwgs,https://xash.su/xash3d.html,,Complicated,game engine,“Custom Gold Source engine rewritten from scratch.”,,,,,1,,,,,,,,,,
+Zandronum,-Euso-,FALSE,https://osdn.net/projects/zandronum/,https://zandronum.com/,,Other,game,"“Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software.”",,,,,1,,,,,,,,,,
+=======
name,reporter,repository,website,more information,license,category,summary,summary source,description,description source,screenshots,mobile compatibility,framework,backend,service,appid,scale-to-fit,notice,flatpak,aur,postmarketos,debian
KTuberling,LINMOB,https://invent.kde.org/games/ktuberling,,,GNU GPLv2,game,"""KTuberling is a simple constructor game suitable for children and adults alike """,https://anongit.kde.org/ktuberling.git,,,https://play.google.com/store/apps/details?id=org.kde.ktuberling,,,,,org.kde.ktuberling,,,,,,
MartianRun,LINMOB,https://github.com/wmora/martianrun,,,Apache-2.0,game,"""A 2D running game built with libGDX.""",https://github.com/wmora/martianrun,,,https://play.google.com/store/apps/details?id=com.gamestudio24.cityescape.android&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1,A,libGDX,,,com.gamestudio24.martianrun,,,,,,
@@ -43,3 +91,4 @@ Magarena,-Euso-,https://github.com/magarena/magarena,https://magarena.github.io/
PrBoom,-Euso-,https://sourceforge.net/projects/prboom/,http://prboom.sourceforge.net/,,GPLv2,game,“PrBoom is the culmination of years of work by various people and projects on the Doom source code.”,,,,,1,,,,,,,,,,
GzDoom,-Euso-,https://github.com/coelckers/gzdoom,https://www.zdoom.org/downloads,,GPLv3,game,“ZDoom is a family of enhanced ports of the Doom engine.”,,,,,1,,,,,,,,,,
Zandronum,-Euso-,https://osdn.net/projects/zandronum/,https://zandronum.com/,,Other,game,"“Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software.”",,,,,1,,,,,,,,,,
+>>>>>>> 406b72dc53faf258e75a487bf1bb95b0a83f51dc
diff --git a/games.html b/games.html
index e7c73c17825557119365a153d3a1d9cf5b19682d..187a12d5e55dd708d4284dbdb9d3adba2196524f 100644
--- a/games.html
+++ b/games.html
@@ -141,7 +141,7 @@ distributed under the conditions of CC BY-SA 4.0 International: https://creative
LINux on MOBile Game List
- LINux on MOBile Apps (short: LINMOBapps) is a fork of the awesome Mobile GNU/Linux Apps (short: MGLApps) list. This is the games list, which is currenty unmaintained — I will happily accept merge requests or give you repository access.See below how you can contribute!
+ LINux on MOBile Apps (short: LINMOBapps) is a fork of the awesome Mobile GNU/Linux Apps (short: MGLApps) list. This is the games list, which is currently maintained by Moxvallix — Contributions to the list are welcome.See below how you can contribute!
Project repository: https://framagit.org/linmobapps/linmobapps.frama.io
@@ -269,6 +269,8 @@ distributed under the conditions of CC BY-SA 4.0 International: https://creative
- name: name of the app
- category: App category (one or two words)
+- reporter: Credit to whoever reported that the app works
+- verified: App has been tested on a Linux mobile, and declared working (touch, ui etc) by a maintainer.
- summary: one or two sentences about the app - normally a quote from the project site
- mobile compatibility: a number between 5 (best) and 0 (worst) to name the mobile compatibility of the app (this is different from MGLApps to be closer to the ratings in Mobian Wiki; category 3 may be redefined, as it includes apps that apparently have not been tested on mobile GNU/Linux or postmarketOS)
- 5 = perfect - nothing left to be done
diff --git a/index.html b/index.html
index 74d6d9765ca75f00bbb9e132a6d92e462eb1aebf..ac0541524116663e508c4e31253c347c8d1e412e 100644
--- a/index.html
+++ b/index.html
@@ -135,7 +135,7 @@ distributed under the conditions of CC BY-SA 4.0 International: https://creative
-
+