Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Old feature: EXP calculator #54

Open
wants to merge 359 commits into
base: master
Choose a base branch
from

Conversation

My2ndAngelic
Copy link

Don't remove it, I found that's very useful for farming.

Yuubari and others added 30 commits August 6, 2014 23:13
This will definitely fail to build. I'm sure.

Conflicts:
	Grabacr07.KanColleViewer/App.config
	Grabacr07.KanColleViewer/App.xaml.cs
	Grabacr07.KanColleViewer/Models/Settings.cs
	Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
	Grabacr07.KanColleViewer/SampleData/RepairyardViewModelSampleData.xaml
	Grabacr07.KanColleViewer/ViewModels/Catalogs/SortableColumnViewModel.cs
	Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetViewModel.cs
	Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/ReSortieBarViewModel.cs
	Grabacr07.KanColleViewer/ViewModels/Contents/ToolsViewModel.cs
	Grabacr07.KanColleViewer/ViewModels/MainContentViewModel.cs
	Grabacr07.KanColleViewer/ViewModels/MainWindowViewModel.cs
	Grabacr07.KanColleViewer/ViewModels/SettingsViewModel.cs
	Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
	Grabacr07.KanColleViewer/Views/Catalogs/SlotItemCatalogWindow.xaml
	Grabacr07.KanColleViewer/Views/Contents/Fleets.xaml
	Grabacr07.KanColleViewer/Views/Contents/Homeport.xaml
	Grabacr07.KanColleViewer/Views/Contents/Overview.xaml
	Grabacr07.KanColleViewer/Views/Contents/Quests.xaml
	Grabacr07.KanColleViewer/Views/Controls/KanColleHost.cs
	Grabacr07.KanColleViewer/Views/MainContent.xaml
	Grabacr07.KanColleViewer/Views/MainWindow.xaml
	Grabacr07.KanColleViewer/Views/Settings/Browser.xaml
	Grabacr07.KanColleViewer/Views/Settings/Browser.xaml.cs
	Grabacr07.KanColleViewer/Views/Settings/Operation.xaml
	Grabacr07.KanColleViewer/Views/Settings/Others.xaml
	Grabacr07.KanColleViewer/Views/Settings/Settings.xaml
	Grabacr07.KanColleViewer/Views/StatusBar.xaml
	Grabacr07.KanColleViewer/packages.config
	Grabacr07.KanColleWrapper/KanColleClient.cs
	Grabacr07.KanColleWrapper/Models/Fleet.cs
	Grabacr07.KanColleWrapper/Models/FleetReSortie.cs
	Grabacr07.KanColleWrapper/Models/Raw/kcsapi_createitem.cs
	Grabacr07.KanColleWrapper/Models/Raw/kcsapi_createship.cs
	README.md
* Moved CustomSound.cs to WindowsNotifier and adjusted references/packages accordingly
Conflicts:
	Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
Conflicts:
	Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
	Grabacr07.KanColleViewer/ViewModels/Contents/ToolsViewModel.cs
	Grabacr07.KanColleViewer/ViewModels/SettingsViewModel.cs
	Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
Yuubari and others added 30 commits May 7, 2015 15:46
大型飛行艇のアイコンを追加
Settings folder path changed to avoid version conflicts with Grabacr07's original builds and other forks.
Forgot to edit the section header.
Conflicts:
	Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
The level is only displayed if it's not the final remodel for that particular shipgirl.
Couple of missing translations fixes
Fixed the quick status of the fleet
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.