Merge branch 'master' of https://github.com/sigonasr2/ngsplanner

3 years ago · 1fdca4e618
parent 097a1a0d16 d3de93a9bf
commit 1fdca4e618
2 changed files with 60 additions and 57 deletions
--- a/src/App.js
+++ b/src/App.js
@ -988,34 +988,34 @@ function App() {
 						BACKENDURL={GetBackendURL(BACKENDURL)}
 					/>
 					<TestPanel
-					APP_TITLE={APP_TITLE}
-					path={PANELPATHWBUILD}
-					author={author} 
-					buildName={buildName} 
-					className={className} 
-					secondaryClassName={secondaryClassName}
-					classLv={classLv} 
-					secondaryClassLv={secondaryClassLv} 
-					bp={bp} 
-					hp={hp} 
-					pp={pp} 
-					def={def} 
-					weaponUp1={weaponUp1} 
-					weaponUp2={weaponUp2} 
-					weaponUp3={weaponUp3} 
-					damageResist={damageResist}
-					burnResist={burnResist} 
-					shockResist={shockResist} 
-					panicResist={panicResist} 
-					stunResist={stunResist} 
-					freezeResist={freezeResist} 
-					blindResist={blindResist} 
-					poisonResist={poisonResist} 
-					statDisplayAtk={statDisplayAtk} 
-					GetData={GetData}
-					LOGGEDINUSER={LOGGEDINUSER}
-					LOGGEDINHASH={LOGGEDINHASH}
-					BACKENDURL={GetBackendURL(BACKENDURL)}
+						APP_TITLE={APP_TITLE}
+						path={PANELPATHWBUILD}
+						author={author} 
+						buildName={buildName} 
+						className={className} 
+						secondaryClassName={secondaryClassName}
+						classLv={classLv} 
+						secondaryClassLv={secondaryClassLv} 
+						bp={bp} 
+						hp={hp} 
+						pp={pp} 
+						def={def} 
+						weaponUp1={weaponUp1} 
+						weaponUp2={weaponUp2} 
+						weaponUp3={weaponUp3} 
+						damageResist={damageResist}
+						burnResist={burnResist} 
+						shockResist={shockResist} 
+						panicResist={panicResist} 
+						stunResist={stunResist} 
+						freezeResist={freezeResist} 
+						blindResist={blindResist} 
+						poisonResist={poisonResist} 
+						statDisplayAtk={statDisplayAtk} 
+						GetData={GetData}
+						LOGGEDINUSER={LOGGEDINUSER}
+						LOGGEDINHASH={LOGGEDINHASH}
+						BACKENDURL={GetBackendURL(BACKENDURL)}
 					/>
 				</Route>
 				<Route path={PANELPATH}>
@ -1025,34 +1025,34 @@ function App() {
 						BACKENDURL={GetBackendURL(BACKENDURL)}
 					/>
 					<TestPanel
-					APP_TITLE={APP_TITLE}
-					path={PANELPATH}
-					author={author} 
-					buildName={buildName} 
-					className={className} 
-					secondaryClassName={secondaryClassName}
-					classLv={classLv} 
-					secondaryClassLv={secondaryClassLv} 
-					bp={bp} 
-					hp={hp} 
-					pp={pp} 
-					def={def} 
-					weaponUp1={weaponUp1} 
-					weaponUp2={weaponUp2} 
-					weaponUp3={weaponUp3} 
-					damageResist={damageResist}
-					burnResist={burnResist} 
-					shockResist={shockResist} 
-					panicResist={panicResist} 
-					stunResist={stunResist} 
-					freezeResist={freezeResist} 
-					blindResist={blindResist} 
-					poisonResist={poisonResist} 
-					statDisplayAtk={statDisplayAtk} 
-					GetData={GetData}
-					LOGGEDINUSER={LOGGEDINUSER}
-					LOGGEDINHASH={LOGGEDINHASH}
-					BACKENDURL={GetBackendURL(BACKENDURL)}
+						APP_TITLE={APP_TITLE}
+						path={PANELPATH}
+						author={author} 
+						buildName={buildName} 
+						className={className} 
+						secondaryClassName={secondaryClassName}
+						classLv={classLv} 
+						secondaryClassLv={secondaryClassLv} 
+						bp={bp} 
+						hp={hp} 
+						pp={pp} 
+						def={def} 
+						weaponUp1={weaponUp1} 
+						weaponUp2={weaponUp2} 
+						weaponUp3={weaponUp3} 
+						damageResist={damageResist}
+						burnResist={burnResist} 
+						shockResist={shockResist} 
+						panicResist={panicResist} 
+						stunResist={stunResist} 
+						freezeResist={freezeResist} 
+						blindResist={blindResist} 
+						poisonResist={poisonResist} 
+						statDisplayAtk={statDisplayAtk} 
+						GetData={GetData}
+						LOGGEDINUSER={LOGGEDINUSER}
+						LOGGEDINHASH={LOGGEDINHASH}
+						BACKENDURL={GetBackendURL(BACKENDURL)}
 					/>
 				</Route>
 				<Route path={process.env.PUBLIC_URL+"/login"}>
--- a/5
+++ b/5
@ -2,4 +2,7 @@
 [Touhou Vocal] [GET IN THE RING] Last Remote～Blaze mix (spanish & english subtitles)
 「Touhou Vocal」[FELT] Innocent Eyes (Eris's double helix mix)
 【東方Vocal】 Red Catastrophe (Extended Mix) 「Amateras Records」
-[Touhou] Amateras Records - Justify the End [Extended Mix] (東方Vocal／Tracy)
+[Touhou] Amateras Records - Justify the End [Extended Mix] (東方Vocal／Tracy)
+東方vocal ラストリモート～Blaze Mix
+【東方English Vocal】 twilight dreamer (MZC Mix) 「ORANGE★JAM」【English Subtitle】
+【東方Vocal／Electro】 Important Lie [Extended Mix] 「Amateras Records」