Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve conflict

Browse source
This commit is contained in:
Kayla Man 2024-02-28 20:49:40 +08:00
commit 9d994fda90
463 changed files with 4825 additions and 4768 deletions
Download patch file Download diff file Expand all files Collapse all files

24
server_addon/applications/server/applications.json
View file

@ -1201,6 +1201,30 @@
}
]
},
"openrv": {
"enabled": true,
"label": "OpenRV",
"icon": "{}/app_icons/openrv.png",
"host_name": "openrv",
"environment": "{\n \n}",
"variants": [
{
"name": "1.0.0",
"use_python_2": false,
"executables": {
"windows": [],
"darwin": [],
"linux": []
},
"arguments": {
"windows": [],
"darwin": [],
"linux": []
},
"environment": "{\n \n}"
}
]
},
"additional_apps": []
}
}

2
server_addon/applications/server/settings.py
View file

@ -186,6 +186,8 @@ class ApplicationsSettings(BaseSettingsModel):
default_factory=AppGroupWithPython, title="Unreal Editor")
wrap: AppGroup = SettingsField(
default_factory=AppGroupWithPython, title="Wrap")
openrv: AppGroup = SettingsField(
default_factory=AppGroupWithPython, title="OpenRV")
additional_apps: list[AdditionalAppGroup] = SettingsField(
default_factory=list, title="Additional Applications")

2
server_addon/applications/server/version.py
View file

@ -1 +1 @@
__version__ = "0.1.5"
__version__ = "0.1.6"