Skip to content

Commit

Permalink
Merge pull request #47 from BobPalmer/DEVELOP
Browse files Browse the repository at this point in the history
0.7.2
  • Loading branch information
BobPalmer committed Mar 3, 2016
2 parents ce40c64 + eb34dd4 commit 318dece
Show file tree
Hide file tree
Showing 42 changed files with 663 additions and 152 deletions.
20 changes: 20 additions & 0 deletions FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
0.6.3 - 2016.03.02
------------------
Logistics pulls are now restricted to warehouses
Warehouses can be toggled

0.6.2 - 2016.02.05
------------------
Added support for Blizzy's Toolbar (thanks nanathan!)

0.6.1 - 2016.02.02
------------------
Fixed an issue where distributed warehouses were excessively greedy

0.6.0 - 2016.02.01
------------------
Added new module for structural supports (versus horribly abusing fairings)
Auto-Repairer part module added (for use with USI-LS and UKS)
Added the concept of global bonuses to prevent circular references (i.e. between kolonization and life support)
Added custom layers to USI Animation

0.5.5 - 2016.01.18
------------------
Inflatable fuel tank module
Expand Down
Binary file modified FOR_RELEASE/GameData/000_USITools/USITools.dll
Binary file not shown.
4 changes: 2 additions & 2 deletions FOR_RELEASE/GameData/000_USITools/USITools.version
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
},
"VERSION":{
"MAJOR":0,
"MINOR":5,
"PATCH":5,
"MINOR":6,
"PATCH":3,
"BUILD":0
},
"KSP_VERSION":{
Expand Down
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.4.9 - 2016.02.01
------------------
Added Hydrates as a resource and also to the resource map (represents regolith with captive water)
Added Gypsum (an excellent raw material for fertilizer) as a resource and to the resource map
ExoticMinerals and RareMetals can now be directly harvested

0.4.8 - 2015.12.08
------------------
Added 'IntakeLqd' - an oceanic resource to help with oceanic-only parts.
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":4,
"PATCH":8,
"PATCH":9,
"BUILD":0
},
"KSP_VERSION":{
Expand Down
35 changes: 24 additions & 11 deletions FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,30 @@
//* SECTION 1 CRP/USI Curated
//******************************

RESOURCE_DEFINITION
{
name = Hydrates
density = 0.00150000000
flowMode = ALL_VESSEL
transfer = PUMP
isTweakable = true
isVisible = true
unitCost = 0.5000000
color = .25,.25,1
}

RESOURCE_DEFINITION
{
name = Gypsum
density = 0.00550000000
flowMode = ALL_VESSEL
transfer = PUMP
isTweakable = true
isVisible = true
unitCost = 0.01
color = 1,1,1
}

RESOURCE_DEFINITION
{
name = IntakeLqd //Like IntakeAtm but for oceans
Expand Down Expand Up @@ -149,17 +173,6 @@ RESOURCE_DEFINITION
isTweakable = true
}

RESOURCE_DEFINITION
{
name = Hydrates
density = 0.00150000000
flowMode = ALL_VESSEL
transfer = PUMP
isTweakable = true
isVisible = true
unitCost = 0.5000000
}

RESOURCE_DEFINITION
{
name = Hydrogen
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
//
// Community Resource Pack
// Resource:
//
//Resource types:
// 0 = Crustal (Stuff you dig up)
// 1 = Oceanic (Stuff in the oceans)
// 2 = Atmospheric (Stuff in the air, varies with pressure)
// 3 = Interplanetary (Stuff you find between planets)
//
//Express all numbers as percentages 0.0-100.0, not 0.0-1.0!
//
PLANETARY_RESOURCE
{
ResourceName = ExoticMinerals
ResourceType = 0
PlanetName = Jool

Distribution
{
PresenceChance = 0
MinAbundance = 0
MaxAbundance = 0
Variance = 0
Dispersal = 0
}
}

GLOBAL_RESOURCE
{
ResourceName = ExoticMinerals
ResourceType = 0

Distribution
{
PresenceChance = 50
MinAbundance = .001
MaxAbundance = 10
Variance = 50
Dispersal = 10
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
//
// Community Resource Pack
// Resource:
//
//Resource types:
// 0 = Crustal (Stuff you dig up)
// 1 = Oceanic (Stuff in the oceans)
// 2 = Atmospheric (Stuff in the air, varies with pressure)
// 3 = Interplanetary (Stuff you find between planets)
//
//Express all numbers as percentages 0.0-100.0, not 0.0-1.0!
//

PLANETARY_RESOURCE
{
ResourceName = Gypsum
ResourceType = 0
PlanetName = Jool

Distribution
{
PresenceChance = 0
MinAbundance = 0
MaxAbundance = 0
Variance = 0
Dispersal = 0
}
}

GLOBAL_RESOURCE
{
ResourceName = Gypsum
ResourceType = 0

Distribution
{
PresenceChance = 70
MinAbundance = .001
MaxAbundance = 10
Variance = 50
Dispersal = 3
}
}
PLANETARY_RESOURCE
{
ResourceName = Gypsum
ResourceType = 0
PlanetName = Kerbin

Distribution
{
PresenceChance = 100
MinAbundance = .001
MaxAbundance = 10
Variance = 50
Dispersal = 3
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
//
// Community Resource Pack
// Resource:
//
//Resource types:
// 0 = Crustal (Stuff you dig up)
// 1 = Oceanic (Stuff in the oceans)
// 2 = Atmospheric (Stuff in the air, varies with pressure)
// 3 = Interplanetary (Stuff you find between planets)
//
//Express all numbers as percentages 0.0-100.0, not 0.0-1.0!
//

PLANETARY_RESOURCE
{
ResourceName = Hydrates
ResourceType = 0
PlanetName = Jool

Distribution
{
PresenceChance = 0
MinAbundance = 0
MaxAbundance = 0
Variance = 0
Dispersal = 0
}
}

GLOBAL_RESOURCE
{
ResourceName = Hydrates
ResourceType = 0

Distribution
{
PresenceChance = 70
MinAbundance = .001
MaxAbundance = 10
Variance = 50
Dispersal = 3
}
}
PLANETARY_RESOURCE
{
ResourceName = Hydrates
ResourceType = 0
PlanetName = Kerbin

Distribution
{
PresenceChance = 100
MinAbundance = .001
MaxAbundance = 10
Variance = 50
Dispersal = 3
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
//
// Community Resource Pack
// Resource:
//
//Resource types:
// 0 = Crustal (Stuff you dig up)
// 1 = Oceanic (Stuff in the oceans)
// 2 = Atmospheric (Stuff in the air, varies with pressure)
// 3 = Interplanetary (Stuff you find between planets)
//
//Express all numbers as percentages 0.0-100.0, not 0.0-1.0!
//
PLANETARY_RESOURCE
{
ResourceName = RareMetals
ResourceType = 0
PlanetName = Jool

Distribution
{
PresenceChance = 0
MinAbundance = 0
MaxAbundance = 0
Variance = 0
Dispersal = 0
}
}

GLOBAL_RESOURCE
{
ResourceName = RareMetals
ResourceType = 0

Distribution
{
PresenceChance = 50
MinAbundance = .001
MaxAbundance = 10
Variance = 50
Dispersal = 10
}
}
Binary file removed FOR_RELEASE/GameData/ModuleManager.2.6.17.dll
Binary file not shown.
Binary file added FOR_RELEASE/GameData/ModuleManager.2.6.18.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion FOR_RELEASE/GameData/UmbraSpaceIndustries/ART/ART.version
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"VERSION":{
"MAJOR":0,
"MINOR":7,
"PATCH":1,
"PATCH":2,
"BUILD":0
},
"KSP_VERSION":{
Expand Down
4 changes: 4 additions & 0 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/ART/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
0.7.2 - 2016.03.02
------------------
Updated dependencies

0.7.1 - 2016.01.17
------------------
Updated dependencies
Expand Down
29 changes: 28 additions & 1 deletion FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,38 @@
0.1.8 - 2016.03.02
------------------
Dependency Updates
3.75m and 5m kontainers and tanks are now distributed warehouses and participate in planetary logistics
Kontainer price fixes (thanks zajc3w!)

0.1.7 - 2016.02.13
------------------
Fixed texture reference in cylindrical tanks (Thanks LouisB3!)
Added a surface attach option for all reactors
Adjusted mass and crash tolerance of all containers for consistency
Increased LqdHydrogen storage to be more in line with stock tank mass ratios
Fixed missing radial tank textures

0.1.6 - 2016.02.08
------------------
Added the mini radial tanks from UKS/MKS-Lite to Core
Added Karborundum, XenonGas, ArgonGas to cylindrical kontainer tanks (thanks LouisB3!)

0.1.5 - 2016.02.01
------------------
Hydrates, Gypsum, and Dirt have been added to kontainers, and the RocketParts texture has been replaced with one for MaterialKits.

0.1.4 - 2016.01.20
------------------
Fixed texture issue on liquid tanks

0.1.3 - 2016.01.18
------------------
Fixed issue with kontainer texture switching
Bundled USITools (for nuclear refueling) and shared FX
Fixed several cost discrepancies (thanks fat-lobyte!)
Deprecated Organics
Replaced RocketParts with MaterialKits - NOTE: Texture has NOT been redone yet!
USI Core is bundled with an Extraplanetary Launchpads config that replaces RocketParts with MaterialKits and SpecializedParts. This is provided for compatibility with the USI mod constellation.
Removed extra texture that was causing some issues with the liquid tanks (round, cylinder, and saddle)

0.1.2 - 2015.11.14
------------------
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 318dece

Please sign in to comment.