The 1.7.2 update up until things stop merging nicely
Merged the unclean part of the 1.7.2 update
Merged the update to the license information
Merged the update correcting the typos
Updated the version string to 1.7.2a
The PD-classes update up until things stop merging nicely
Merged the unclean part of the PD-classes update
Removing immersive-mode stuff as it seems to be incompatible
Fixed a typo and made some final changes for compatibility
Updated version to 1.7.2a for iOS
Fixed a bug I created when removing the immersive mode code
Fixed a mistake I made when merging that caused the char select bug
This fixes last commit, which should have been a move instead of a copy
Update assets to 1.7.2
apply clean merge of pixel-dungeon-gdx 1.7.2a to shattered 1.7.2a
 # Please enter the commit message for your changes. Lines starting
Merge all but the 4 files that feel like they'd be better handled by the dev
Apply additional patches (diffs were actually mostly whitespace)
Apply the final piece of the patch, which turns out was whitespace
Comment out versionCode stuff as it relies on android package management
Merge updates to PD-classes aside from the versionCode stuff