Open
Conversation
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
Status bar might also be fixed now.
Conflicts: Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs Grabacr07.KanColleViewer/ViewModels/Contents/ToolsViewModel.cs Grabacr07.KanColleViewer/ViewModels/SettingsViewModel.cs Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
大型飛行艇のアイコンを追加
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
…overed" instead of the actual state.
Fixed the quick status of the fleet
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Don't remove it, I found that's very useful for farming.