Skip to content

Commit

Permalink
Merge pull request #1 from BobPalmer/DEVELOP
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
BobPalmer committed Oct 27, 2015
2 parents 6c7ee5a + 9df6f43 commit 57c4e41
Show file tree
Hide file tree
Showing 112 changed files with 117 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.zip
File renamed without changes.
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
0.5.2 - 2015.10.16
Moved nuclear reactors to Advanced Science Tech in the stock tech tree, and Nuclear Power/ Large Nuclear Power in CTT
Bundled container CTT configs from MKS
Moved KIS kontainers into appropriate CTT nodes
Swapped DepletedUranium for DepletedFuel in reactors and containers
------------------
Moved out reactors and tanks to the USI_Core repo

0.5.1 - 2015.10.06
-------------------
Expand Down
File renamed without changes.
File renamed without changes
Binary file added FOR_RELEASE/GameData/000_USITools/USITools.dll
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"NAME":"USI Tools",
"URL":"https://raw.githubusercontent.com/BobPalmer/UmbraSpaceIndustries/master/GameData/UmbraSpaceIndustries/USICore.version"
"DOWNLOAD":"https://github.com/BobPalmer/UmbraSpaceIndustries/releases"
"URL":"https://raw.githubusercontent.com/BobPalmer/UmbraSpaceIndustries/master/GameData/UmbraSpaceIndustries/USICore.version",
"DOWNLOAD":"https://github.com/BobPalmer/UmbraSpaceIndustries/releases",
"GITHUB":{
"USERNAME":"BobPalmer",
"REPOSITORY":"UmbraSpaceIndustries",
"ALLOW_PRE_RELEASE":false,
"ALLOW_PRE_RELEASE":false
},
"VERSION":{
"MAJOR":0,
Expand All @@ -22,7 +22,7 @@
"MAJOR":1,
"MINOR":0,
"PATCH":0
}
},
"KSP_VERSION_MAX":{
"MAJOR":1,
"MINOR":0,
Expand Down
14 changes: 14 additions & 0 deletions FOR_RELEASE/GameData/Firespitter/Firespitter.version
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"NAME": "Firespitter",
"URL": "https://raw.githubusercontent.com/snjo/Firespitter/master/For%20release/Firespitter/Firespitter.version",
"VERSION": {
"MAJOR": 7,
"MINOR": 1,
"PATCH": 4
},
"KSP_VERSION": {
"MAJOR": 1,
"MINOR": 0,
"PATCH": 4
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@TWEAKSCALEEXPONENTS[FSfuelSwitch]:NEEDS[TweakScale]
{
@tankList
{
@resources
{
@amount = 3
@maxAmount = 3
}
}
%basePartMass = 3
weightList = 3
tankCostList = 3
}
Binary file not shown.
8 changes: 8 additions & 0 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
0.1.0 - 2015.10.16
------------------
Broke USI_Core out from the USITools DLL
Moved nuclear reactors to Advanced Science Tech in the stock tech tree, and Nuclear Power/ Large Nuclear Power in CTT
Bundled container CTT configs from MKS
Moved KIS kontainers into appropriate CTT nodes
Swapped DepletedUranium for DepletedFuel in reactors and containers

12 changes: 12 additions & 0 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/Orion/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
0.1.0.2 - 2015.10.27
--------------------
Bundled Firespitter (needed for tank switching)

0.1.0.1 - 2015.10.16
--------------------
Fixed typo in version file

0.1.0 - 2015.10.16
--------------------
Synced up with current USI Core code
Added KSP-AVC support
31 changes: 31 additions & 0 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/Orion/Orion.version
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"NAME":"MKS",
"URL":"https://raw.githubusercontent.com/BobPalmer/NuclearRockets/master/GameData/UmbraSpaceIndustries/Orion/Orion.version",
"DOWNLOAD":"https://github.com/BobPalmer/NuclearRockets/releases",
"GITHUB":{
"USERNAME":"BobPalmer",
"REPOSITORY":"NuclearRockets",
"ALLOW_PRE_RELEASE":false
},
"VERSION":{
"MAJOR":0,
"MINOR":1,
"PATCH":0,
"BUILD":2
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":0,
"PATCH":4
},
"KSP_VERSION_MIN":{
"MAJOR":1,
"MINOR":0,
"PATCH":0
},
"KSP_VERSION_MAX":{
"MAJOR":1,
"MINOR":0,
"PATCH":4
}
}
31 changes: 31 additions & 0 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"NAME":"USI Tools",
"URL":"https://raw.githubusercontent.com/BobPalmer/USI_Core/master/GameData/UmbraSpaceIndustries/USICore.version",
"DOWNLOAD":"https://github.com/BobPalmer/USI_Core/releases",
"GITHUB":{
"USERNAME":"BobPalmer",
"REPOSITORY":"UmbraSpaceIndustries",
"ALLOW_PRE_RELEASE":false
},
"VERSION":{
"MAJOR":0,
"MINOR":0,
"PATCH":1,
"BUILD":0
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":0,
"PATCH":4
},
"KSP_VERSION_MIN":{
"MAJOR":1,
"MINOR":0,
"PATCH":0
},
"KSP_VERSION_MAX":{
"MAJOR":1,
"MINOR":0,
"PATCH":4
}
}
Binary file removed GameData/000_USITools/USITools.dll
Binary file not shown.

0 comments on commit 57c4e41

Please sign in to comment.