Phillip Thelen 7c1a682ded Merge branch 'version/4.3.0' ... # Conflicts: # Habitica/res/values-in/strings.sidebar.xml # Habitica/res/values-in/strings.tutorial.xml # Habitica/res/values-in/strings.xml # Habitica/res/values-ja/strings.sidebar.xml # Habitica/res/values-ja/strings.xml # Habitica/res/values-pt-rBR/strings.sidebar.xml # Habitica/res/values-pt-rBR/strings.tutorial.xml # Habitica/res/values-pt-rBR/strings.xml # Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt # Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt # Habitica/src/main/java/com/habitrpg/android/habitica/helpers/Analytics.kt # Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt # Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt # Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.kt # Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildOverviewFragment.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentItemRow.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt # common/src/main/java/com/habitrpg/common/habitica/extensions/ViewExt.kt # common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt # common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt # common/src/main/java/com/habitrpg/common/habitica/views/PixelArtView.kt # wearos/src/main/res/values-ru/strings.xml		2023-10-18 15:10:37 +02:00
..
libs	Implement levelup activity	2022-07-05 17:14:02 +02:00
src	Merge branch 'version/4.3.0'	2023-10-18 15:10:37 +02:00
.gitignore	Move AvatarView to common module	2022-06-02 09:14:08 +02:00
build.gradle.kts	Improve wearos compatibility	2023-10-04 18:11:43 +02:00
consumer-rules.pro	disable R8 full mode for now	2023-05-02 14:16:57 +02:00
proguard-rules.pro	disable R8 full mode for now	2023-05-02 14:16:57 +02:00