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 |
|
Grzegorz
|
022e17417f
|
frag PL translation
|
2015-04-10 03:37:30 +02:00 |
|
Grzegorz
|
2925100ec6
|
frag PL translation
|
2015-04-10 03:36:32 +02:00 |
|
Legolasindar
|
dc44b73a36
|
Update stringtable.xml
updated spanish terms
|
2015-04-10 01:12:31 +02:00 |
|
licht-im-Norden87
|
0986eb427d
|
Update stringtable.xml
|
2015-04-09 23:41:10 +02:00 |
|
commy2
|
5ea35a01bb
|
sorting out required addons for modularity
|
2015-04-09 13:23:29 +02:00 |
|
bux578
|
92da20ce62
|
translations
#367
|
2015-04-07 10:02:33 +02:00 |
|
jaynus
|
1bb6be5654
|
Cleaning up of all tabs in source code files.
|
2015-04-06 09:22:43 -07:00 |
|
Nou
|
12cadc603f
|
Fragmentation enabled.
|
2015-03-21 21:22:16 -07:00 |
|
Felix Wiegand
|
7c1703ae11
|
Create README.md
|
2015-01-26 13:46:21 +01:00 |
|
PabstMirror
|
6e8c394903
|
Standardize Config Version Stuff
|
2015-01-18 01:32:07 -06:00 |
|
jaynus
|
3fb2a8e245
|
big code clean up
|
2015-01-12 21:14:27 -08:00 |
|
jaynus
|
1e29509b45
|
Dragon, lasers, air_hud and javelin code.
|
2015-01-11 10:24:19 -08:00 |
|