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.

Sign up for GitHub

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

Jump to bottom

com.rest.blockadelabs 1.2.1 #14

Merged
merged 1 commit into from
Dec 10, 2023
Merged

com.rest.blockadelabs 1.2.1 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
com.rest.blockadelabs 1.2.1 
- Fixed Settings config lookup
  • Loading branch information
@StephenHodgson
StephenHodgson committed Dec 10, 2023
commit 5b8ba5b7b566519cbf16fd0550af2cae0bc53607
13 changes: 8 additions & 5 deletions BlockadeLabs/Packages/com.rest.blockadelabs/Runtime/BlockadeLabsSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,16 @@ public BlockadeLabsSettings(BlockadeLabsConfiguration configuration)
configuration = Resources.LoadAll<BlockadeLabsConfiguration>(string.Empty).FirstOrDefault(asset => asset != null);
}

if (configuration == null)
if (configuration != null)
{
throw new MissingReferenceException($"Failed to find a valid {nameof(BlockadeLabsConfiguration)}!");
Info = new BlockadeLabsSettingsInfo(configuration.ProxyDomain);
cachedDefault = this;
}
else
{
Info = new BlockadeLabsSettingsInfo();
cachedDefault = this;
}

Info = new BlockadeLabsSettingsInfo(configuration.ProxyDomain);
cachedDefault = this;
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion BlockadeLabs/Packages/com.rest.blockadelabs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "BlockadeLabs",
"description": "A Non-Official Blockade Labs Rest Client for Unity (UPM)",
"keywords": [],
"version": "1.2.0",
"version": "1.2.1",
"unity": "2021.3",
"documentationUrl": "https://github.com/RageAgainstThePixel/com.rest.blockadelabs#documentation",
"changelogUrl": "https://github.com/RageAgainstThePixel/com.rest.blockadelabs/releases",
Expand Down
4 changes: 2 additions & 2 deletions BlockadeLabs/ProjectSettings/ProjectVersion.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2022.3.14f1
m_EditorVersionWithRevision: 2022.3.14f1 (eff2de9070d8)
m_EditorVersion: 2022.3.15f1
m_EditorVersionWithRevision: 2022.3.15f1 (b58023a2b463)