Skip to content

Commit

Permalink
Merge pull request #1149 from BobPalmer/DEVELOP
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
BobPalmer authored Feb 5, 2017
2 parents 557f5fb + 1638079 commit cfe1bcf
Show file tree
Hide file tree
Showing 127 changed files with 8,435 additions and 306 deletions.
25 changes: 25 additions & 0 deletions FOR_RELEASE/GameData/000_AT_Utils/000_AT_Utils.version
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"NAME":"000_AT_Utils",
"URL":"https://raw.githubusercontent.com/allista/AT_Utils/master/GameData/000_AT_Utils/000_AT_Utils.version",
"DOWNLOAD":"https://github.com/allista/AT_Utils/releases",
"CHANGE_LOG_URL":"",
"VERSION":
{
"MAJOR":1,
"MINOR":4,
"PATCH":0,
"BUILD":0
},
"KSP_VERSION_MIN":
{
"MAJOR":1,
"MINOR":2,
"PATCH":2
},
"KSP_VERSION_MAX":
{
"MAJOR":1,
"MINOR":2,
"PATCH":2
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
StylesConfig
{
//available colors: normal (meaning white), grey, red, dark_red, green, dark_green, yellow, dark_yellow, cyan, magenta
EnabledButtonColor = green
ActiveButtonColor = yellow
InactiveButtonColor = grey
ConfirmButtonColor = green
AddButtonColor = green
CloseButtonColor = red
DangerButtonColor = red
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
AbsMinSize = 0.5
AbsMaxSize = 10
AbsMinAspect = 0.5
AbsMaxAspect = 10
4 changes: 4 additions & 0 deletions FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
0.8.12 - 2017.02.04
------------------
Dependency Updates

0.8.11 - 2017.01.16
-------------------
Fixed runaway efficiency issue
Expand Down
Binary file modified FOR_RELEASE/GameData/000_USITools/USITools.dll
Binary file not shown.
Binary file modified FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb
Binary file not shown.
Binary file modified FOR_RELEASE/GameData/000_USITools/USITools.pdb
Binary file not shown.
2 changes: 1 addition & 1 deletion FOR_RELEASE/GameData/000_USITools/USITools.version
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"VERSION":{
"MAJOR":0,
"MINOR":8,
"PATCH":11,
"PATCH":12,
"BUILD":0
},
"KSP_VERSION":{
Expand Down
Binary file not shown.
31 changes: 31 additions & 0 deletions FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"DOWNLOAD": "https://github.com/BobPalmer/CommunityCategoryKit/releases",
"GITHUB": {
"ALLOW_PRE_RELEASE": false,
"REPOSITORY": "CommunityCategoryKit",
"USERNAME": "BobPalmer"
},
"KSP_VERSION": {
"MAJOR": 1,
"MINOR": 2,
"PATCH": 2
},
"KSP_VERSION_MAX": {
"MAJOR": 1,
"MINOR": 2,
"PATCH": 2
},
"KSP_VERSION_MIN": {
"MAJOR": 1,
"MINOR": 2,
"PATCH": 0
},
"NAME": "Community Category Kit",
"URL": "https://raw.githubusercontent.com/BobPalmer/CommunityCategoryKit/master/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version",
"VERSION": {
"BUILD": 0,
"MAJOR": 1,
"MINOR": 2,
"PATCH": 2
}
}
27 changes: 27 additions & 0 deletions FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
1.2.2 - 2016.02.04
------------------
Added Rovers as a new standard category

1.2.1 - 2016.12.12
- [Change] Recompile for KSP 1.2.2

1.2.0 - 2016.12.2
- [Enhancement] Define common filters via a config file.
- [Enhancement] Allow defining custom filters by updating via ModuleManager (read Wiki!).

1.1.0 - 2016.11.29
- [Fix #7] Add images for Containers category.
- [Fix #9] Sync up DLL's and mod's versions.

0.1.2 - (KSP 1.2.1)
-------------------
Recompile for KSP 1.2.1

0.1.1 - 2016.10.15
------------------
Fixed initial tag for real this time

0.1.0 - 2016.10.15
------------------
Initial Release!
Added tag of cck-lifesupport
32 changes: 32 additions & 0 deletions FOR_RELEASE/GameData/CommunityCategoryKit/common-filters.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// This file contains filters approved by CCK owners.
// Do not change this file via ModuleManager! If you need a new filter in
// the editor you should add it into "extra-filters.cfg".
// See more info here: https://github.com/BobPalmer/CommunityCategoryKit/wiki
CCKCommonFilterConfig
{
Item
{
name = Containers
tag = cck-containers
normalIcon = CommunityCategoryKit/icons/Containers
usedByMod = Kerbal Inventory System (KIS)
usedByMod = Kerbal Attachment System (KAS)
}
Item
{
name = Life Support
tag = cck-lifesupport
normalIcon = CommunityCategoryKit/icons/LifeSupport_N
selectedIcon = CommunityCategoryKit/icons/LifeSupport_S
usedByMod = USI Life Support
}
Item
{
name = Rovers
tag = cck-rovers
normalIcon = CommunityCategoryKit/icons/Rovers_N
selectedIcon = CommunityCategoryKit/icons/Rovers_S
usedByMod = Malemute
usedByMod = Feline Utility Rovers
}
}
43 changes: 43 additions & 0 deletions FOR_RELEASE/GameData/CommunityCategoryKit/extra-filters.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
// This file is always empty in CCK but third-party mods are allowed (and
// encouraged) to extend it with own custom filters. There will be a
// filter entry created in the editor for every Item record in this file if
// it has at least one matching part.
//
// In order to create a custom filter create a ModuleManager patch file and
// put it anywhere in your mod's folder structure:
//
// @CCKExtraFilterConfig
// {
// Item
// {
// name = Cool Mod Things
// tag = cck-cool-mod
// normalIcon = CoolMod/Textures/FilterIcon
// usedByMod = Cool Mod
// }
// }
// NOTE. If you want a special icon to be displayed when the filter is active
// use `selectedIcon` field to define one.
//
// See more info here: https://github.com/BobPalmer/CommunityCategoryKit/wiki
//
// NOTE. Avoid creating a brand new filter only because you feel you need
// one. You may improve players experience by re-using filters used by the
// other mods. To figure out if there are right candidates try the following:
// 1. Check CCK common filters (common-filters.cfg).
// 2. Try searching KSP add-ons forum for keyword "CCK" or
// "CommunityCategoryKit". When mod uses CCK it's usually stated in the
// description.
// 3. Ask community by posting a question on the CCK forum.
// 4. Find another mod (other than yours) which may benefit of the new
// filter, and suggest a new common filter on the CCK forum!
//
// Once you've found the right mod just use its tag and some icon texture
// (communicate with the author if they use own icon). CCK will automatically
// de-dupe filters so what there will be only one filter created with all the
// matching parts.

CCKExtraFilterConfig
{
// Add Item entires for custom filters via ModuleManager.
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
0.6.6 - 2017.02.04
------------------
Added common resource Sodium a potential high efficient electric propellant
Added common resource Caesium a rare but dense and highly efficient electric propellant
ResourceLode value set to zero to prevent exploits.

0.6.5 - (2017.01.01)
--------------------
Updated asteroid and scanner settings
Expand Down
2 changes: 1 addition & 1 deletion FOR_RELEASE/GameData/CommunityResourcePack/CRP.version
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"VERSION":{
"MAJOR":0,
"MINOR":6,
"PATCH":5,
"PATCH":6,
"BUILD":0
},
"KSP_VERSION":{
Expand Down
69 changes: 68 additions & 1 deletion FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ RESOURCE_DEFINITION
density = 0.005
flowMode = ALL_VESSEL
transfer = NONE
unitCost = 250
unitCost = 0
isTweakable = true
isVisible = true
volume = 1
Expand Down Expand Up @@ -680,6 +680,19 @@ RESOURCE_DEFINITION
volume = 1
}

RESOURCE_DEFINITION
{
abbreviation = Cs
name = Caesium
density = 0.00193
flowMode = ALL_VESSEL
transfer = PUMP
isTweakable = true
isVisible = true
unitCost = 77
volume = 1
}

RESOURCE_DEFINITION
{
abbreviation = C
Expand Down Expand Up @@ -1014,6 +1027,33 @@ RESOURCE_DEFINITION
volume = 1
}

RESOURCE_DEFINITION
{
abbreviation = Na
name = Sodium
density = 0.000968
flowMode = ALL_VESSEL
transfer = PUMP
isTweakable = true
isVisible = true
unitCost = 1.4
volume = 1
}

RESOURCE_DEFINITION
{
abbreviation = PVC
name = PolyvinylChloride
density = 0.00149
hsp = 7981
flowMode = ALL_VESSEL
transfer = PUMP
isTweakable = true
isVisible = true
unitCost = 1
volume = 1
}

RESOURCE_DEFINITION
{
abbreviation = Pu238
Expand All @@ -1028,6 +1068,20 @@ RESOURCE_DEFINITION
ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Plutonium-238
}


RESOURCE_DEFINITION
{
abbreviation = R
name = Regolith
density = 0.002
flowMode = ALL_VESSEL
transfer = PUMP
isTweakable = true
isVisible = true
unitCost = 0.355
volume = 1
}

RESOURCE_DEFINITION
{
abbreviation = UF4
Expand Down Expand Up @@ -1068,6 +1122,19 @@ RESOURCE_DEFINITION
volume = 1
}

RESOURCE_DEFINITION
{
abbreviation = SW
name = SolarWind
density = 0.00000124725
flowMode = ALL_VESSEL
transfer = PUMP
isTweakable = true
isVisible = true
unitCost = 0.001
volume = 1
}

RESOURCE_DEFINITION
{
abbreviation = ThP
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"NAME":"ConfigurableContainers",
"URL":"https://github.com/allista/ConfigurableContainers/tree/master/GameData/ConfigurableContainers/ConfigurableContainers.version",
"DOWNLOAD":"https://github.com/allista/ConfigurableContainers/releases",
"CHANGE_LOG_URL":"",
"VERSION":
{
"MAJOR":2,
"MINOR":4,
"PATCH":0,
"BUILD":3
},
"KSP_VERSION_MIN":
{
"MAJOR":1,
"MINOR":2,
"PATCH":2
},
"KSP_VERSION_MAX":
{
"MAJOR":1,
"MINOR":2,
"PATCH":2
}
}
Loading

0 comments on commit cfe1bcf

Please sign in to comment.