summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2018-11-19 13:48:19 -0500
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2018-11-19 13:48:19 -0500
commit593723b7940ba72a786fc4c7366c56f9813d977b (patch)
tree4d23fbef5bc5a20115f10ca04ae3379df78cc8e1
parent4f28ea33bd7cc65485402c5e85259083e86b49e1 (diff)
parent3dc27a5681dcfc4ae30e95570d9966f2e14a4dd7 (diff)
downloadSMAPI-593723b7940ba72a786fc4c7366c56f9813d977b.tar.gz
SMAPI-593723b7940ba72a786fc4c7366c56f9813d977b.tar.bz2
SMAPI-593723b7940ba72a786fc4c7366c56f9813d977b.zip
Merge branch 'develop' into stable
-rw-r--r--.editorconfig2
-rw-r--r--build/GlobalAssemblyInfo.cs4
-rw-r--r--build/common.targets133
-rw-r--r--build/prepare-install-package.targets145
-rw-r--r--build/prepare-nuget-package.targets13
-rw-r--r--docs/README.md2
-rw-r--r--docs/release-notes.md78
-rw-r--r--docs/technical-docs.md79
-rw-r--r--src/SMAPI.Installer/Framework/InstallerPaths.cs18
-rw-r--r--src/SMAPI.Installer/InteractiveInstaller.cs270
-rw-r--r--src/SMAPI.Installer/Program.cs69
-rw-r--r--src/SMAPI.Installer/README.txt (renamed from src/SMAPI.Installer/readme.txt)20
-rw-r--r--src/SMAPI.Installer/StardewModdingAPI.Installer.csproj16
-rw-r--r--src/SMAPI.Installer/unix-install.sh4
-rw-r--r--src/SMAPI.Installer/unix-launcher.sh18
-rw-r--r--src/SMAPI.Installer/windows-exe-config.xml5
-rw-r--r--src/SMAPI.Installer/windows-install.bat1
-rw-r--r--src/SMAPI.ModBuildConfig.Analyzer.Tests/SMAPI.ModBuildConfig.Analyzer.Tests.csproj6
-rw-r--r--src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs57
-rw-r--r--src/SMAPI.ModBuildConfig/Properties/AssemblyInfo.cs4
-rw-r--r--src/SMAPI.ModBuildConfig/StardewModdingAPI.ModBuildConfig.csproj4
-rw-r--r--src/SMAPI.ModBuildConfig/build/smapi.targets10
-rw-r--r--src/SMAPI.ModBuildConfig/package.nuspec13
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/StardewModdingAPI.Mods.ConsoleCommands.csproj5
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/manifest.json4
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/packages.config4
-rw-r--r--src/SMAPI.Mods.SaveBackup/Framework/ModConfig.cs9
-rw-r--r--src/SMAPI.Mods.SaveBackup/ModEntry.cs13
-rw-r--r--src/SMAPI.Mods.SaveBackup/StardewModdingAPI.Mods.SaveBackup.csproj3
-rw-r--r--src/SMAPI.Mods.SaveBackup/manifest.json4
-rw-r--r--src/SMAPI.Tests/Core/ModResolverTests.cs3
-rw-r--r--src/SMAPI.Tests/StardewModdingAPI.Tests.csproj38
-rw-r--r--src/SMAPI.Tests/Utilities/SemanticVersionTests.cs1
-rw-r--r--src/SMAPI.Tests/packages.config10
-rw-r--r--src/SMAPI.Web/Controllers/IndexController.cs11
-rw-r--r--src/SMAPI.Web/Controllers/ModsApiController.cs136
-rw-r--r--src/SMAPI.Web/Controllers/ModsController.cs74
-rw-r--r--src/SMAPI.Web/Framework/Clients/Nexus/NexusMod.cs1
-rw-r--r--src/SMAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs11
-rw-r--r--src/SMAPI.Web/Framework/ConfigModels/SiteConfig.cs8
-rw-r--r--src/SMAPI.Web/Framework/LogParsing/LogParser.cs25
-rw-r--r--src/SMAPI.Web/Framework/ModRepositories/BaseRepository.cs6
-rw-r--r--src/SMAPI.Web/Framework/ModRepositories/ChucklefishRepository.cs7
-rw-r--r--src/SMAPI.Web/Framework/ModRepositories/GitHubRepository.cs7
-rw-r--r--src/SMAPI.Web/Framework/ModRepositories/IModRepository.cs3
-rw-r--r--src/SMAPI.Web/Framework/ModRepositories/NexusRepository.cs7
-rw-r--r--src/SMAPI.Web/StardewModdingAPI.Web.csproj14
-rw-r--r--src/SMAPI.Web/Startup.cs4
-rw-r--r--src/SMAPI.Web/ViewModels/IndexModel.cs7
-rw-r--r--src/SMAPI.Web/ViewModels/ModCompatibilityModel.cs40
-rw-r--r--src/SMAPI.Web/ViewModels/ModLinkModel.cs28
-rw-r--r--src/SMAPI.Web/ViewModels/ModListModel.cs36
-rw-r--r--src/SMAPI.Web/ViewModels/ModModel.cs110
-rw-r--r--src/SMAPI.Web/Views/Index/Index.cshtml34
-rw-r--r--src/SMAPI.Web/Views/Index/Privacy.cshtml43
-rw-r--r--src/SMAPI.Web/Views/LogParser/Index.cshtml25
-rw-r--r--src/SMAPI.Web/Views/Mods/Index.cshtml94
-rw-r--r--src/SMAPI.Web/Views/Shared/_Layout.cshtml1
-rw-r--r--src/SMAPI.Web/appsettings.Development.json4
-rw-r--r--src/SMAPI.Web/appsettings.json11
-rw-r--r--src/SMAPI.Web/wwwroot/Content/css/index.css5
-rw-r--r--src/SMAPI.Web/wwwroot/Content/css/log-parser.css4
-rw-r--r--src/SMAPI.Web/wwwroot/Content/css/mods.css135
-rw-r--r--src/SMAPI.Web/wwwroot/Content/css/privacy.css3
-rw-r--r--src/SMAPI.Web/wwwroot/Content/js/mods.js205
-rw-r--r--src/SMAPI.Web/wwwroot/StardewModdingAPI.metadata.json1400
-rw-r--r--src/SMAPI.sln16
-rw-r--r--src/SMAPI/Constants.cs37
-rw-r--r--src/SMAPI/Context.cs2
-rw-r--r--src/SMAPI/Enums/SkillType.cs26
-rw-r--r--src/SMAPI/Events/BuildingListChangedEventArgs.cs (renamed from src/SMAPI/Events/WorldBuildingListChangedEventArgs.cs)4
-rw-r--r--src/SMAPI/Events/ButtonPressedEventArgs.cs (renamed from src/SMAPI/Events/InputButtonPressedEventArgs.cs)4
-rw-r--r--src/SMAPI/Events/ButtonReleasedEventArgs.cs (renamed from src/SMAPI/Events/InputButtonReleasedEventArgs.cs)4
-rw-r--r--src/SMAPI/Events/ContentEvents.cs4
-rw-r--r--src/SMAPI/Events/ControlEvents.cs32
-rw-r--r--src/SMAPI/Events/CursorMovedEventArgs.cs (renamed from src/SMAPI/Events/InputCursorMovedEventArgs.cs)4
-rw-r--r--src/SMAPI/Events/DayEndingEventArgs.cs (renamed from src/SMAPI/Events/GameLoopLaunchedEventArgs.cs)4
-rw-r--r--src/SMAPI/Events/DayStartedEventArgs.cs7
-rw-r--r--src/SMAPI/Events/DebrisListChangedEventArgs.cs (renamed from src/SMAPI/Events/WorldDebrisListChangedEventArgs.cs)4
-rw-r--r--src/SMAPI/Events/EventArgsInventoryChanged.cs2
-rw-r--r--src/SMAPI/Events/EventArgsLevelUp.cs13
-rw-r--r--src/SMAPI/Events/GameEvents.cs32
-rw-r--r--src/SMAPI/Events/GameLaunchedEventArgs.cs7
-rw-r--r--src/SMAPI/Events/GraphicsEvents.cs28
-rw-r--r--src/SMAPI/Events/IDisplayEvents.cs39
-rw-r--r--src/SMAPI/Events/IGameLoopEvents.cs37
-rw-r--r--src/SMAPI/Events/IInputEvents.cs8
-rw-r--r--src/SMAPI/Events/IModEvents.cs12
-rw-r--r--src/SMAPI/Events/IMultiplayerEvents.cs17
-rw-r--r--src/SMAPI/Events/IPlayerEvents.cs17
-rw-r--r--src/SMAPI/Events/ISpecialisedEvents.cs14
-rw-r--r--src/SMAPI/Events/IWorldEvents.cs14
-rw-r--r--src/SMAPI/Events/InputEvents.cs8
-rw-r--r--src/SMAPI/Events/InventoryChangedEventArgs.cs56
-rw-r--r--src/SMAPI/Events/ItemStackSizeChange.cs35
-rw-r--r--src/SMAPI/Events/LargeTerrainFeatureListChangedEventArgs.cs (renamed from src/SMAPI/Events/WorldLargeTerrainFeatureListChangedEventArgs.cs)4
-rw-r--r--src/SMAPI/Events/LevelChangedEventArgs.cs42
-rw-r--r--src/SMAPI/Events/LocationEvents.cs12
-rw-r--r--src/SMAPI/Events/LocationListChangedEventArgs.cs (renamed from src/SMAPI/Events/WorldLocationListChangedEventArgs.cs)4
-rw-r--r--src/SMAPI/Events/MenuChangedEventArgs.cs31
-rw-r--r--src/SMAPI/Events/MenuEvents.cs8
-rw-r--r--src/SMAPI/Events/MineEvents.cs4
-rw-r--r--src/SMAPI/Events/ModMessageReceivedEventArgs.cs46
-rw-r--r--src/SMAPI/Events/MouseWheelScrolledEventArgs.cs (renamed from src/SMAPI/Events/InputMouseWheelScrolledEventArgs.cs)4
-rw-r--r--src/SMAPI/Events/MultiplayerEvents.cs16
-rw-r--r--src/SMAPI/Events/NpcListChangedEventArgs.cs (renamed from src/SMAPI/Events/WorldNpcListChangedEventArgs.cs)4
-rw-r--r--src/SMAPI/Events/ObjectListChangedEventArgs.cs (renamed from src/SMAPI/Events/WorldObjectListChangedEventArgs.cs)4
-rw-r--r--src/SMAPI/Events/PeerContextReceivedEventArgs.cs25
-rw-r--r--src/SMAPI/Events/PeerDisconnectedEventArgs.cs25
-rw-r--r--src/SMAPI/Events/PlayerEvents.cs12
-rw-r--r--src/SMAPI/Events/RenderedActiveMenuEventArgs.cs16
-rw-r--r--src/SMAPI/Events/RenderedEventArgs.cs16
-rw-r--r--src/SMAPI/Events/RenderedHudEventArgs.cs16
-rw-r--r--src/SMAPI/Events/RenderedWorldEventArgs.cs16
-rw-r--r--src/SMAPI/Events/RenderingActiveMenuEventArgs.cs16
-rw-r--r--src/SMAPI/Events/RenderingEventArgs.cs16
-rw-r--r--src/SMAPI/Events/RenderingHudEventArgs.cs16
-rw-r--r--src/SMAPI/Events/RenderingWorldEventArgs.cs16
-rw-r--r--src/SMAPI/Events/ReturnedToTitleEventArgs.cs7
-rw-r--r--src/SMAPI/Events/SaveCreatedEventArgs.cs7
-rw-r--r--src/SMAPI/Events/SaveCreatingEventArgs.cs7
-rw-r--r--src/SMAPI/Events/SaveEvents.cs24
-rw-r--r--src/SMAPI/Events/SaveLoadedEventArgs.cs7
-rw-r--r--src/SMAPI/Events/SavedEventArgs.cs7
-rw-r--r--src/SMAPI/Events/SavingEventArgs.cs7
-rw-r--r--src/SMAPI/Events/SpecialisedEvents.cs6
-rw-r--r--src/SMAPI/Events/TerrainFeatureListChangedEventArgs.cs (renamed from src/SMAPI/Events/WorldTerrainFeatureListChangedEventArgs.cs)4
-rw-r--r--src/SMAPI/Events/TimeChangedEventArgs.cs30
-rw-r--r--src/SMAPI/Events/TimeEvents.cs8
-rw-r--r--src/SMAPI/Events/UnvalidatedUpdateTickedEventArgs.cs36
-rw-r--r--