esteldunedain
|
d6e70cfe6b
|
Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3
Conflicts:
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/frag/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/medical/stringtable.xml
|
2015-04-10 16:20:18 -03:00 |
|
Jo David
|
33a14076fc
|
Merge branch 'master' of https://github.com/acemod/ACE3 into translations
Conflicts:
addons/captives/stringtable.xml
addons/medical/stringtable.xml
|
2015-04-10 09:01:24 +02:00 |
|
Legolasindar
|
5a849fe8a4
|
Update stringtable.xml
added spanish translation
|
2015-04-10 01:33:08 +02:00 |
|
bux578
|
92da20ce62
|
translations
#367
|
2015-04-07 10:02:33 +02:00 |
|
PabstMirror
|
1695837e0c
|
1.42 Inventory Config
|
2015-03-27 13:10:55 -05:00 |
|
PabstMirror
|
6ac83b7702
|
Cleanup
|
2015-03-09 18:53:19 -05:00 |
|
PabstMirror
|
35f72e0fda
|
Dynamic Inventory Size
|
2015-03-09 18:46:51 -05:00 |
|
KoffeinFlummi
|
c407553d49
|
Add remaining READMEs, add helper script
|
2015-01-26 14:34:48 +01:00 |
|
PabstMirror
|
6e8c394903
|
Standardize Config Version Stuff
|
2015-01-18 01:32:07 -06:00 |
|
KoffeinFlummi
|
3a44b58b5f
|
Add PBOPREFIX to inventory
|
2015-01-14 21:14:53 +01:00 |
|
KoffeinFlummi
|
250050129b
|
CBAify inventory
|
2015-01-14 09:45:20 +01:00 |
|
KoffeinFlummi
|
4f4c9ab1b4
|
Move inventory to addons
|
2015-01-14 09:23:41 +01:00 |
|