Skip to content

Commit

Permalink
Merge pull request #274 from ihsoft/next
Browse files Browse the repository at this point in the history
Release 1.15
  • Loading branch information
ihsoft authored Oct 27, 2018
2 parents bef0827 + d4e89c4 commit 42f8731
Show file tree
Hide file tree
Showing 46 changed files with 2,073 additions and 219 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 1.15 (October 27th, 2018):
* [Change] KSP 1.5.* compatibility.
* [Fix #268] Wrong size detection on the MH expansion parts. READ #273!!!
* [Fix #269] Equip items and remove helmet actions don't work.
* [Fix #270] Command seats must not be allowed to have inventory.
* [Fix #271] In some languages the CCK tags are broken.

# 1.14 (July 18th, 2018):
* [Change] Migrate to KSPDev Utils 0.37.0. A stability fix.

Expand Down
Binary file modified Deps/CommunityCategoryKit/CCK.dll
Binary file not shown.
14 changes: 7 additions & 7 deletions Deps/CommunityCategoryKit/CCK.version
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":4,
"MINOR":5,
"PATCH":0
},
"KSP_VERSION_MIN":{
"MAJOR":1,
"MINOR":4,
"MINOR":5,
"PATCH":0
},
"KSP_VERSION_MAX":{
"MAJOR":1,
"MINOR":4,
"MINOR":5,
"PATCH":9
},
"NAME": "Community Category Kit",
"URL": "https://raw.githubusercontent.com/BobPalmer/CommunityCategoryKit/master/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version",
"VERSION": {
"BUILD": 0,
"MAJOR": 3,
"MAJOR": 4,
"MINOR": 0,
"PATCH": 0
}
"PATCH": 0,
"BUILD": 0
}
}
12 changes: 12 additions & 0 deletions Deps/CommunityCategoryKit/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
4.0.0 - 2018.10.20
------------------
KSP 1.5.0 Compatibility

3.2.0 - 2018.06.22
------------------
KSP 1.4.4 Compatibility

3.1.0 - 2018.03.13
-----------------
KSP 1.4.1 Compatibility

3.0.0 - 2018.03.07
------------------
KSP 1.4.0 Compatibility
Expand Down
Binary file not shown.
16 changes: 8 additions & 8 deletions KIS.version
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
"DOWNLOAD": "http://forum.kerbalspaceprogram.com/index.php?/topic/149848-12-kerbal-inventory-system-kis-v131/",
"KSP_VERSION": {
"MAJOR": 1,
"MINOR": 4,
"PATCH": 0
"MINOR": 5,
"PATCH": 1
},
"KSP_VERSION_MAX": {
"MAJOR": 1,
"MINOR": 4,
"MINOR": 5,
"PATCH": 99
},
"KSP_VERSION_MIN": {
"MAJOR": 1,
"MINOR": 4,
"PATCH": 0
"MINOR": 5,
"PATCH": 1
},
"NAME": "Kerbal Inventory System",
"URL": "https://raw.githubusercontent.com/ihsoft/KIS/master/KIS.version",
"VERSION": {
"BUILD": 33741,
"BUILD": 42207,
"MAJOR": 1,
"MINOR": 14,
"PATCH": 6773
"MINOR": 15,
"PATCH": 6873
}
}
2 changes: 1 addition & 1 deletion Lang/en-us.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Localization

#KIS_ContainerMount1_Part_description = A small mount to attach, detach and reattach SC-62 containers. The best solution over struts, decoupler or duct tape.
#KIS_ContainerMount1_Part_manufacturer = KIS
#KIS_ContainerMount1_Part_tags = KIS EVA building portable container
#KIS_ContainerMount1_Part_tags = KIS EVA building portable container cck-containers
#KIS_ContainerMount1_Part_title = SM-62 Container Mount

// ********** Part: KIS.electricScrewdriver
Expand Down
32 changes: 16 additions & 16 deletions Lang/es-es.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,117 +9,117 @@ Localization

#KIS_basketball_Part_description = Una gran herramienta para probar experimentaciones gravitacionales.
#KIS_basketball_Part_manufacturer = KIS
#KIS_basketball_Part_tags = cck-aev-items
#KIS_basketball_Part_tags = cck-eva-items
#KIS_basketball_Part_title = Balón

// ********** Part: KIS.beer

#KIS_beer_Part_description = Una cerveza sabrosa y asequible. Todo gestor de la agencia espacial debería definitivamente ofrecer algo a su equipo agradecido para mantener alta la moral y la motivación.
#KIS_beer_Part_manufacturer = KIS
#KIS_beer_Part_tags = cck-aev-items
#KIS_beer_Part_tags = cck-eva-items
#KIS_beer_Part_title = Cerveza Bub
#KIS_beer_Part_useName = Bebida

// ********** Part: KIS.bomb1

#KIS_bomb1_Part_description = ¿Necesita deshacerse de esos desechos molestos sin desorbitarse? Tenemos lo que necesitamos. Recuerde, puede configurar explosivos haciendo clic en la parte derecha.
#KIS_bomb1_Part_manufacturer = KIS
#KIS_bomb1_Part_tags = KIS AEV portable herramienta destrucción bomba cck-aev-items
#KIS_bomb1_Part_tags = KIS AEV portable herramienta destrucción bomba cck-eva-items
#KIS_bomb1_Part_title = Explosivos estándar K4

// ********** Part: kis.concreteBase1

#kis_concreteBase1_Part_description = A base de hormigón para unir partes. A través de un milagro de la ciencia, los ingenieros descubrieron cómo unirlo al suelo con un destornillador o una llave.
#kis_concreteBase1_Part_manufacturer = KIS
#kis_concreteBase1_Part_tags = KIS AEV portable construcción hormigón cck-aev-items
#kis_concreteBase1_Part_tags = KIS AEV portable construcción hormigón cck-eva-items
#kis_concreteBase1_Part_title = CB1 Base Tierra

// ********** Part: KIS.Container1

#KIS_Container1_Part_description = Un pequeño contenedor para almacenar partes más pequeñas. Los ingenieros de Kerbal se dieron cuenta de que tener un lugar para almacenar repuestos es mucho mejor que tenerlos flotando alrededor de las cápsulas de comando.
#KIS_Container1_Part_manufacturer = KIS
#KIS_Container1_Part_tags = KIS inventario contenedor portable cck-contenedores
#KIS_Container1_Part_tags = KIS inventario contenedor portable cck-containers
#KIS_Container1_Part_title = SC-62 Contenedor portátil

// ********** Part: KIS.Container2

#KIS_Container2_Part_description = El ILC-18k es un contenedor en línea diseñado para ser accesible desde el interior de una nave y elimina la necesidad de ir a AEV para acceder al hardware de repuesto. Sin embargo, como está presurizado, el ILC-18k tiene una masa extra en comparación con otros contenedores y no tiene montura dedicada.
#KIS_Container2_Part_manufacturer = KIS
#KIS_Container2_Part_tags = KIS contenedor inventario cck-contenedores
#KIS_Container2_Part_tags = KIS contenedor inventario cck-containers
#KIS_Container2_Part_title = ILC-18k Contenedor

// ********** Part: KIS.Container3

#KIS_Container3_Part_description = El ISC-6K es un pequeño contenedor en línea diseñado para ser accesible desde el interior de una nave y elimina la necesidad de ir a AEV para acceder al hardware de repuesto. Sin embargo, como está presurizado, el ISC-6K tiene una masa extra en comparación con otros contenedores y no tiene montura dedicada.
#KIS_Container3_Part_manufacturer = KIS
#KIS_Container3_Part_tags = KIS contenedor inventario cck-contenedores
#KIS_Container3_Part_tags = KIS contenedor inventario cck-containers
#KIS_Container3_Part_title = ISC-6K Contenedor

// ********** Part: KIS.ContainerMount1

#KIS_ContainerMount1_Part_description = Una pequeña montura para unir, separar y volver a colocar los contenedores SC-62. La mejor solución sobre puntales, desacopladores o cinta adhesiva.
#KIS_ContainerMount1_Part_manufacturer = KIS
#KIS_ContainerMount1_Part_tags = KIS AEV construcción portable contenedor
#KIS_ContainerMount1_Part_tags = KIS AEV construcción portable contenedor cck-containers
#KIS_ContainerMount1_Part_title = SM-62 Contenedor de Montaje

// ********** Part: KIS.electricScrewdriver

#KIS_electricScrewdriver_Part_description = Una herramienta para unir o separar partes a sus vehículos. El E-SD80 ha sido diseñado para dar más autonomía a nuestros ingenieros "allá afuera".
#KIS_electricScrewdriver_Part_manufacturer = KIS
#KIS_electricScrewdriver_Part_tags = KIS AEV herramienta construcción portable cck-aev-items
#KIS_electricScrewdriver_Part_tags = KIS AEV herramienta construcción portable cck-eva-items
#KIS_electricScrewdriver_Part_title = E-SD80 Destornillador electrico

// ********** Part: KIS.evapropellant

#KIS_evapropellant_Part_description = Un tanque de respaldo propulsante en AEV útil para la actividad extravehicular. Haga clic derecho en el inventario para usar. Se puede repostar desde un inventario de cápsula.
#KIS_evapropellant_Part_manufacturer = KIS
#KIS_evapropellant_Part_tags = KIS AEV combustible portable cck-aev-items
#KIS_evapropellant_Part_tags = KIS AEV combustible portable cck-eva-items
#KIS_evapropellant_Part_title = AEV-11 Recipiente de combustible
#KIS_evapropellant_Part_useName = Repostar

// ********** Part: KIS.ghettoblaster

#KIS_ghettoblaster_Part_description = Matar el tiempo en viajes espaciales largos o rescates en espera no son tareas fáciles. El Boombox (TM) debe mantener nuestros kerbonauts ocupados.
#KIS_ghettoblaster_Part_manufacturer = KIS
#KIS_ghettoblaster_Part_tags = cck-aev-items
#KIS_ghettoblaster_Part_tags = cck-eva-items
#KIS_ghettoblaster_Part_title = Ghetto Blaster

// ********** Part: KIS.golfclub

#KIS_golfclub_Part_description = Otro experimento de gravedad no aprobado es jugar Golf en Mun.
#KIS_golfclub_Part_manufacturer = KIS
#KIS_golfclub_Part_tags = cck-aev-items
#KIS_golfclub_Part_tags = cck-eva-items
#KIS_golfclub_Part_title = Palo de golf Alphard Kerman
#KIS_golfclub_Part_useName = Swing

// ********** Part: KIS.guide

#KIS_guide_Part_description = Todo lo que necesita saber sobre el sistema de inventario sin una complicada maniobra de computadora. (haz clic derecho en el inventario para leerlo)
#KIS_guide_Part_manufacturer = KIS
#KIS_guide_Part_tags = KIS inventario construcción libro portable cck-aev-items
#KIS_guide_Part_tags = KIS inventario construcción libro portable cck-eva-items
#KIS_guide_Part_title = KIS para tontos
#KIS_guide_Part_useName = Leer

// ********** Part: KIS.guitar

#KIS_guitar_Part_description = Algunas veces, las rarezas espaciales necesitan un solo de guitarra.
#KIS_guitar_Part_manufacturer = KIS
#KIS_guitar_Part_tags = cck-aev-items
#KIS_guitar_Part_tags = cck-eva-items
#KIS_guitar_Part_title = Guitarra de Davwie Kerman

// ********** Part: KIS.taco

#KIS_taco_Part_description = Carne de res, verduras y salsa picante en una tortilla. Todo lo que nuestros kerbonauts necesitan para una comida cero G.
#KIS_taco_Part_manufacturer = KIS
#KIS_taco_Part_tags = cck-aev-items
#KIS_taco_Part_tags = cck-eva-items
#KIS_taco_Part_title = Taco de Chradfield Kerman
#KIS_taco_Part_useName = Comer

// ********** Part: KIS.wrench

#KIS_wrench_Part_description = Una herramienta para unir o separar las piezas más pequeñas a sus vehículos. Nada complicado, solo una simple llave realmente.
#KIS_wrench_Part_manufacturer = KIS
#KIS_wrench_Part_tags = KIS AEV herramienta construcción portable cck-aev-items
#KIS_wrench_Part_tags = KIS AEV herramienta construcción portable cck-eva-items
#KIS_wrench_Part_title = BS-8 Llave de uso general

// ********** Type: KIS.GUIUtils.VolumeLType, KSPDev Messages
Expand Down
2 changes: 1 addition & 1 deletion Lang/it-it.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Localization

#KIS_ContainerMount1_Part_description = Una piccola montatura per attaccare, staccare e riattaccare contenitori SC-62. La migliore soluzione tra puntoni, disaccoppiatori o nastro adesivo.
#KIS_ContainerMount1_Part_manufacturer = KIS
#KIS_ContainerMount1_Part_tags = KIS EVA building portable container
#KIS_ContainerMount1_Part_tags = KIS EVA building portable container cck-containers
#KIS_ContainerMount1_Part_title = Montatura per Contenitori SM-62

// ********** Part: KIS.electricScrewdriver
Expand Down
2 changes: 1 addition & 1 deletion Lang/zh-cn.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Localization

#KIS_ContainerMount1_Part_description = 一个小型连接柱安装附件.该卡扣可以用于连接"SC-62 便携式仓库",是避免使用支架连接器(钢筋/胶带)来固定便携式仓库的最佳解决方案.
#KIS_ContainerMount1_Part_manufacturer = KIS
#KIS_ContainerMount1_Part_tags = KIS EVA building portable container
#KIS_ContainerMount1_Part_tags = KIS EVA building portable container cck-containers
#KIS_ContainerMount1_Part_title = SM-62便携式仓库卡扣

// ********** Part: KIS.electricScrewdriver
Expand Down
9 changes: 4 additions & 5 deletions Parts/bomb1/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,11 @@ PART
allowPartAttach = AllowedAlways
shortcutKeyAction = equip
equipable = true
equipSlot = leftHand
equipSlot = leftElbow
stackable = true
equipMeshName = body01
equipBoneName = bn_l_mid_a01
equipPos = (0.06,0.07,0)
equipDir = (0,0,0)
equipBoneName = aliasLeftElbow
equipPos = 0.0, 0.07, 0
equipDir = 180, 270, 180
delay = 10
maxRadius = 10
}
Expand Down
7 changes: 3 additions & 4 deletions Parts/container1/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,9 @@ PART
carriable = true
equipMode = part
equipSlot = jetpack
equipMeshName = jetpack_base01
equipBoneName = bn_jetpack01
equipPos = (0,0.21,-0.3)
equipDir = (280,0,0)
equipBoneName = aliasJetpack
equipPos = 0.0, 0.21, -0.3
equipDir = 280, 0, 0
runSpeed = 0.8
}
}
7 changes: 3 additions & 4 deletions Parts/electricScrewdriver/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@ PART
stackable = true
equipSkill = RepairSkill
equipSlot = rightHand
equipMeshName = body01
equipBoneName = bn_r_mid_a01
equipPos = (0,0.05,0)
equipDir = (270,0,0)
equipBoneName = aliasRightPalm
equipPos = 0.0, 0.05, 0.0
equipDir = 270, 0, 0
toolPartAttach = true
toolStaticAttach = false
toolPartStack = true
Expand Down
7 changes: 3 additions & 4 deletions Parts/evapropellant1/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,9 @@ PART
usableFromPod = true
usableFromEditor = false
useName = #KIS_evapropellant_Part_useName //#KIS_evapropellant_Part_useName = Refuel
equipMeshName = jetpack_base01
equipBoneName = bn_jetpack01
equipPos = (0.06,0.04,-0.09)
equipDir = (10,0,0)
equipBoneName = aliasJetpack
equipPos = 0.06, 0.04, -0.09
equipDir = 10, 0, 0
allowPartAttach = Disabled
}
}
7 changes: 3 additions & 4 deletions Parts/guide/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,9 @@ PART
equipable = true
stackable = true
useName = #KIS_guide_Part_useName //#KIS_guide_Part_useName = Read
equipMeshName = body01
equipBoneName = bn_l_mid_a01
equipPos = (0.00,-0.02,0)
equipDir = (0,0,0)
equipBoneName = aliasLeftPalm
equipPos = 0.0, -0.02, 0.0
equipDir = 0, 0, 0
pageWidth = 574
pageHeight = 800
page = KIS/Parts/guide/page01
Expand Down
7 changes: 3 additions & 4 deletions Parts/wrench/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@ PART
stackable = true
equipSkill = RepairSkill
equipSlot = rightHand
equipMeshName = body01
equipBoneName = bn_r_mid_a01
equipPos = (0,0.03,0)
equipDir = (0,90,0)
equipBoneName = aliasRightPalm
equipPos = 0.0, 0.03, 0.0
equipDir = 0, 90, 0
toolPartAttach = true
toolStaticAttach = false
toolPartStack = false
Expand Down
3 changes: 1 addition & 2 deletions Patches/MM-StockParts.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
carriable = true
equipMode = part
equipSlot = jetpack
equipMeshName = jetpack_base01
equipBoneName = bn_jetpack01
equipBoneName = aliasJetpack
equipPos = (0,0.21,-0.3)
equipDir = (10,0,0)
runSpeed = 0.8
Expand Down
Loading

0 comments on commit 42f8731

Please sign in to comment.