gitkeep

.gitignore

@@ -1,12 +1,19 @@
 Graphics/CustomBattlers/local_sprites/*
+Graphics/Pokemon/FusionIcons/*
 Graphics/Battlers/Shiny/*
 
 Graphics/CustomBattlers/spritesheets/*
 Graphics/CustomBattlers/*
+Data/sprites/*
 Data/VERSION
 infinitefusion.sh
+Data/sprites/CUSTOM_SPRITES
+Data/sprites
+Data/sprites/updated_spritesheets_cache
+Data/sprites/sprites_rate_limit.log
 .gitignore
 Game.rxproj
 .DS_Store
 PBS/*
+Game.exe
 rpgmaker.sh

Credits.txt

@@ -107,9 +107,9 @@ casinoluck<s>ymirbot
 
 
 ###################################
-###	Custom Pokedex entries					###
+###	Custom Pok?dex entries					###
 ###################################
-### Pokedex entries quality control (Unown)
+### Pok?dex entries quality control (Unown)
 luvischlo<s>char_latte3412<s>strawbearycandy
 bobosmith01<s>griddle<s>.izik
 knilk<s>lordjoostmeister<s>.realthree
@@ -127,10 +127,6 @@ Maruno (http://pokemonessentials.wikia.com/wiki/Pok%C3%A9mon_Essentials_Wiki)
 ###########################################################
 Playtesting was done by various members of the Discord channel. 
 Special thanks to all of you!
-
-Elite 4 rematch teams
-duskrd<s>anaconja
-
 ###########################################################
 ###			Graphics			  #
 ###########################################################
@@ -144,14 +140,6 @@ Nintendo
 GameFreak
 
 
-########################
-###			Translations			  #
-########################
-French translation:
-anthonygourmand
-locpic_
-blood.wolf58 (Willi)
-
 #######################################################################
 The following ressources were also used 
 with their respective authors' consent

Data/.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/../../../../../../../../../../../:\Users\charl\Documents\Jeux\rpgmaker\infinitefusion\dev\infinitefusion-e18\Data\.idea/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

Data/.idea/vcs.xml

@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/Scripts" vcs="Git" />
   </component>
 </project>