Commit Graph

1528 Commits

Author SHA1 Message Date
Shadow ce308e2e9c Resetting Game Server 2014-12-02 09:31:51 +02:00
Shadow e215031011 Resetting Game Server 2014-12-02 09:29:01 +02:00
Shadow 4f1d04e864 Update admin.php 2014-12-02 09:28:08 +02:00
Shadow b781d1f6d1 Update playeradditionalinfo.tpl 2014-11-25 13:58:45 +02:00
Shadow 6deedfc8d7 Update deletion.tpl 2014-10-29 14:27:29 +02:00
Shadow ceb85298c1 Update en.php 2014-10-06 11:18:21 +03:00
Shadow 034b935f57 Update en.php 2014-10-06 11:15:45 +03:00
Shadow 5c7e0cbd5d Update en.php 2014-10-06 10:34:12 +03:00
Shadow 0f17bbd3f1 Update mapview.tpl 2014-09-26 11:05:00 +03:00
Shadow d712dd10d0 Update mapview.tpl 2014-09-26 11:04:30 +03:00
Shadow 34a8237d54 updates 2014-05-26 07:37:18 +03:00
Shadow 61935472dc Merge pull request #164 from armando1980/patch-60
fix lang tempalte/map by: Armando
2014-05-19 10:48:45 +03:00
Shadow f025b8950e Merge pull request #163 from armando1980/patch-59
fix lang tempalte/build by: Armando
2014-05-19 10:48:23 +03:00
armando1980 305bc76665 fix lang tempalte/map by: Armando 2014-05-16 12:23:48 -04:00
armando1980 0239f3f0d8 fix lang tempalte/build by: Armando 2014-05-16 12:06:20 -04:00
Shadow 27557bc5e2 Update en.php 2014-05-15 14:05:55 +03:00
Shadow 49dba1743e Update Automation.php 2014-05-12 09:25:12 +03:00
Shadow 74293e4f53 update 2014-05-12 08:49:33 +03:00
Shadow 8e6a39a900 Merge branch 'master' of https://github.com/Shadowss/TravianZ
Conflicts:
	GameEngine/Lang/en.php
2014-05-12 08:45:37 +03:00
Shadow e337ac2b4d update 2014-05-12 08:43:32 +03:00
Shadow a8a79eb6ef Merge pull request #152 from armando1980/patch-48
fix lang tempalte/build by: Armando
2014-05-12 08:42:13 +03:00
Shadow 82f758eb81 Merge pull request #153 from armando1980/patch-49
fix lang tempalte/build by: Armando
2014-05-12 08:42:09 +03:00
Shadow 00f4f85f8b Merge pull request #154 from armando1980/patch-50
fix lang tempalte/build by: Armando
2014-05-12 08:42:05 +03:00
Shadow 554f02389c Merge pull request #155 from armando1980/patch-51
fix lang tempalte/build by: Armando
2014-05-12 08:42:02 +03:00
Shadow 8a8354914e Merge pull request #156 from armando1980/patch-52
fix lang tempalte/build by: Armando
2014-05-12 08:41:57 +03:00
Shadow 98189504cd Merge pull request #157 from armando1980/patch-53
fix lang tempalte/build by: Armando
2014-05-12 08:41:53 +03:00
Shadow 33335ef434 Merge pull request #158 from armando1980/patch-54
fix lang tempalte/build by: Armando
2014-05-12 08:41:50 +03:00
Shadow 67e2a4dabf Merge pull request #159 from armando1980/patch-55
fix lang tempalte/build by: Armando
2014-05-12 08:41:35 +03:00
Shadow c48bd508a1 Merge pull request #160 from armando1980/patch-56
fix lang tempalte/build by: Armando
2014-05-12 08:41:32 +03:00
Shadow f6249e72c9 Merge pull request #161 from armando1980/patch-57
fix lang tempalte/build by: Armando
2014-05-12 08:41:29 +03:00
Shadow 19c7953677 Merge pull request #162 from armando1980/patch-58
fix lang tempalte/build by: Armando
2014-05-12 08:41:26 +03:00
armando1980 1646b7468e fix lang tempalte/build by: Armando 2014-05-10 12:35:44 -04:00
armando1980 daface8021 fix lang tempalte/build by: Armando 2014-05-10 09:10:32 -04:00
armando1980 513fcde7f3 fix lang tempalte/build by: Armando 2014-05-10 09:01:32 -04:00
armando1980 522def1809 fix lang tempalte/build by: Armando 2014-05-10 00:25:03 -04:00
armando1980 c5ef8c3c97 fix lang tempalte/build by: Armando 2014-05-10 00:21:04 -04:00
armando1980 75cc5664f8 fix lang tempalte/build by: Armando 2014-05-10 00:19:16 -04:00
armando1980 e95c8dc483 fix lang tempalte/build by: Armando 2014-05-10 00:17:06 -04:00
armando1980 c875dd3f2e fix lang tempalte/build by: Armando 2014-05-10 00:00:49 -04:00
armando1980 150623a42e fix lang tempalte/build by: Armando 2014-05-09 23:50:23 -04:00
armando1980 5b6ae9e44c fix lang tempalte/build by: Armando 2014-05-09 23:47:35 -04:00
armando1980 7214bea94f fix lang tempalte/build by: Armando 2014-05-09 23:40:24 -04:00
Shadow 3aab6b37df Update Automation.php 2014-05-09 08:33:13 +03:00
Shadow 2926e6b585 Update Battle.php 2014-04-02 10:48:06 +03:00
Shadow cae32d6603 Update addUsers.php 2014-03-25 08:28:27 +02:00
Shadow ee29c5bb7f Merge pull request #143 from sempoi/patch-31
Update addUsers.tpl
2014-03-24 07:26:02 +02:00
Shadow 7a0470a30d Merge pull request #142 from sempoi/patch-30
Update village.tpl
2014-03-24 07:25:51 +02:00
Shadow 170f365897 Merge pull request #141 from sempoi/patch-29
Update addABTroops.tpl
2014-03-24 07:25:41 +02:00
Shadow bf50e409b8 Merge pull request #140 from sempoi/patch-28
Update admin.php
2014-03-24 07:25:33 +02:00
Shadow 1c92b54ea2 Merge pull request #139 from sempoi/patch-27
Update addTroops.tpl
2014-03-24 07:25:24 +02:00