Merge remote-tracking branch 'origin/develop-6.6' into develop-6.6

Allow changing gender of single gender Pokemon

.gitignore

@@ -1,8 +1,17 @@
-Graphics/Battlers/*
+Graphics/CustomBattlers/local_sprites/*
-Graphics/Battlers_resized/*
-Graphics/CustomBattlers/*
-Graphics/Battlers/*
 Graphics/Pokemon/FusionIcons/*
-Data/SPRITE_CREDS
+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.rxproj
+rpgmaker.sh

Credits.txt

@@ -45,7 +45,7 @@ Special thanks to Aegide and Reizod for helping to rip the sprites from the webs
 and to the owners of the respective fusion websites for accepting to share
 their sprites.
 
-Intro cinamatic
+Intro cinematic
 #####################
 Kiwikelly
 
@@ -115,7 +115,8 @@ with their respective authors' consent
 		Hankiro (Oak backsprite) 		http://s296.photobucket.com/user/Hankiro/media/ProfOakBackSprite.png.html
 		SailorVicious (Prof. Elm OW sprite) 	https://www.deviantart.com/sailorvicious
 		OceansLugiaSpirit (Koga OW sprite)  	http://oceanslugiaspirit.deviantart.com/
-
+		Wolfang62: https://www.deviantart.com/wolfang62/art/Wimpod-Sprite-Overworld-836704744
+		zender1752 (Sabrina OW sprite)
 	Battle sprites: 
 		Custom graphics:
 		Kiwikelly, UnworthyPie
@@ -123,7 +124,7 @@ with their respective authors' consent
 		Free use graphics:
 		luckygirl88  (Misty VS sprite) 		http://luckygirl88.deviantart.com/art/Pokemon-BW-Misty-Sprite-Sheet-268364830
 		Lorelei VS sprite by Nalty 		http://nalty.deviantart.com/art/Lorelei-VS-Sprite-177184960
-		
+		x-5-4-5-2 (Sabrina sprite) 		https://www.deviantart.com/x-5-4-5-2/art/Game-Sabrina-204548703
 ### Custom tileset graphics ###
 Kiwikelly
 
@@ -131,6 +132,9 @@ Kiwikelly
 TCGrunler#4583
 elupsis
 
+### Battle type icons ###
+audreyeyeyeye https://www.deviantart.com/audreyeyeyeye/art/Pokemon-Type-Icons-FREE-TO-USE-909562921
+
 ### Public tileset graphics ### 
 	Jorginho (OutsideEmerald)
 	ThatsSoWitty (Cave) http://thatssowitty.deviantart.com/art/The-Public-Pokemon-Tileset-281342410
@@ -202,6 +206,7 @@ Marin				Better maps script	https://www.pokecommunity.com/showthread.php?t=41129
 barafanatic			Safari Zone improvements
 M3rein				Easy Questing System 
 bo4p5687			Multisave
+Vizualise			In-battle type icons (adapted from) https://github.com/Vizualyse/PokemonInfiniteFusion-EnemyTypesMod
 
 
 #### Data sources ###			  

Data/.idea/.gitignore

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

Data/.idea/codeStyles/Project.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="FORMATTER_TAGS_ENABLED" value="true" />
-  </code_scheme>
-</component>

Data/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>