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

@@ -1,5 +1,5 @@
 ##########		CREDITS	         ###############
-Pok?mon Infinite Fusion & Pok?mon Infinite Fusion: Hoenn
+Pok?mon Infinite Fusion: Hoenn
 Game made by Chardub
 
 *This is NOT an official Pokemon game. The author of this game is not 
@@ -139,13 +139,6 @@ Gen 4 Legendary trio eggs by calicorn
 Nintendo
 GameFreak
 
-###########################################################
-###	French translation  #
-###########################################################
-anthonygourmand
-locpic_
-blood.wolf58 (Willi)
-ragzzh
 
 #######################################################################
 The following ressources were also used 
@@ -165,7 +158,6 @@ with their respective authors' consent
 		zender1752 (Sabrina OW sprite)	https://www.deviantart.com/zender1752/art/Pokemon-Anime-Delia-Ketchum-Overworld-sprite-840038766
 		wesleyfg (Hoenn overworld NPCs) https://www.deviantart.com/wesleyfg/art/Hoenn-People-OW-in-BW-style-274475232
 		Wergan https://www.deviantart.com/wergan/art/Pokemon-Random-characters-002-959395621
-		TooManyLuigis, Mortedes, Billla,WolfPP: Golurk overworld sprite https://www.deviantart.com/wolfang62/art/Golurk-Sprite-Overworld-834611476
 	Battle sprites: 
 		Custom graphics:
 		Kiwikelly, UnworthyPie
@@ -207,7 +199,6 @@ audreyeyeyeye https://www.deviantart.com/audreyeyeyeye/art/Pokemon-Type-Icons-FR
 		Phyromatical, Gallanty (deviantart)
 
 ### Music ###				
-	Saffron City (Team Rocket): mystora				
 	Pokeli 			https://www.youtube.com/channel/UC2ccJMFWSbjklOQESSBP_dw
 				https://www.youtube.com/watch?v=0ohkADYWCYE
 				https://www.youtube.com/watch?v=6EWYYzRSpMM
@@ -241,7 +232,12 @@ Move animations:
 ###			RPG Maker Scripts		###
 ###########################################################
 
-andracass (Pokémon Reborn)	Compiler optimization
+#Custom Infinite fusion scripts: 
+Improved Shinies: anthonygourmand
+andracass (Pok?on Reborn)	Compiler optimization (legacy)
+
+#Public use scripts:
+
 Luka S.J.			Elite Battle System
 				Animated Title Screen (modified):
 shiney570 			BW2 Summary script (+ graphics)	http://reliccastle.com/forums/showthread.php?tid=1090

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>