Commit Graph

1347 Commits

Author SHA1 Message Date
Shadow 1e46ecc77c Update Battle.php 2014-02-19 07:37:37 +02:00
Shadow 06af170c47 Update Units.php 2014-02-18 08:26:33 +02:00
Shadow 102d42e731 Merge pull request #95 from armando1980/patch-41
fix lang rally point ok by: Armando
2014-02-17 08:42:24 +02:00
Shadow 57ce864b4d Merge pull request #94 from armando1980/patch-40
fix lang rally point ok by: Armando
2014-02-17 08:41:53 +02:00
Shadow fe94e6325e Merge pull request #93 from armando1980/patch-39
fix lang rally point ok by: Armando
2014-02-17 08:41:45 +02:00
Shadow 0b114cf444 Merge pull request #92 from armando1980/patch-38
fix lang rally point ok by: Armando
2014-02-17 08:41:07 +02:00
Shadow b7eb44661a Merge pull request #96 from armando1980/patch-42
fix lang rally point ok by: Armando
2014-02-17 08:40:52 +02:00
Shadow 19d51a5cd6 Merge pull request #97 from armando1980/patch-43
fix lang rally point ok by: Armando
2014-02-17 08:40:45 +02:00
Shadow b33cba3fba Merge pull request #98 from armando1980/patch-44
fix lang rally point ok by: Armando
2014-02-17 08:40:39 +02:00
Shadow 80f346236e Merge pull request #99 from armando1980/patch-45
fix lang rally point ok by: Armando
2014-02-17 08:40:31 +02:00
Shadow 8e1bec2160 Merge branch 'master' of https://github.com/Shadowss/TravianZ 2014-02-17 08:12:10 +02:00
Shadow 0231274907 lang update 2014-02-17 08:11:54 +02:00
armando1980 776a4d00cb fix lang rally point ok by: Armando 2014-02-16 18:52:16 -05:00
armando1980 2c85eff4a2 fix lang rally point ok by: Armando 2014-02-16 18:51:20 -05:00
armando1980 c976cc0e71 fix lang rally point ok by: Armando 2014-02-16 18:49:58 -05:00
armando1980 3ff3641ef1 fix lang rally point ok by: Armando 2014-02-16 18:45:10 -05:00
armando1980 636ef7c372 fix lang rally point ok by: Armando 2014-02-16 18:33:47 -05:00
armando1980 f46e71d775 fix lang rally point ok by: Armando 2014-02-16 18:33:30 -05:00
armando1980 d5ea4fdbe5 fix lang rally point ok by: Armando 2014-02-16 18:19:37 -05:00
armando1980 9e135efcb5 fix lang rally point ok by: Armando 2014-02-16 18:15:00 -05:00
Shadow 268d46c782 Update upgrade.tpl 2014-02-16 09:03:37 +02:00
Shadow c20b0a2033 Update availupgrade.tpl 2014-02-16 09:02:45 +02:00
Shadow 0cf063ba19 Update dorf2.php 2014-02-16 09:01:55 +02:00
Shadow fae5e45551 Update dorf1.php 2014-02-16 09:01:48 +02:00
Shadow 1996e5df42 Update Building.php 2014-02-16 09:01:00 +02:00
Shadow ef45f955c4 Update Automation.php 2014-02-14 11:41:51 +02:00
Shadow 7274234b7e Update def_end.tpl 2014-02-14 11:33:23 +02:00
Shadow 6996bd7d31 Update Battle.php 2014-02-14 11:30:19 +02:00
Shadow 64b32ed26a Merge branch 'master' of https://github.com/Shadowss/TravianZ 2014-02-13 08:05:22 +02:00
Shadow 80c8d93edf security update 2014-02-13 08:05:11 +02:00
Shadow 7ee6731e01 Merge pull request #89 from armando1980/patch-37
it's fixed if you choice skip. by Armando
2014-02-12 09:47:01 +02:00
armando1980 9a6af85bdd it's fixed if you choice skip. by Armando 2014-02-11 18:55:56 -05:00
Shadow 3293b6f94d Update 5.tpl 2014-02-11 13:13:28 +02:00
Shadow e43de8face Update index.php 2014-02-11 08:26:26 +02:00
Shadow 9f5c09678d Update indexnews.tpl 2014-02-11 08:25:34 +02:00
Shadow 2029d40d9a Update Battle.php 2014-02-10 07:42:46 +02:00
Shadow 6b335d4d0a Update Battle.php 2014-02-10 07:39:00 +02:00
Shadow a960a5a50b Update Automation.php 2014-02-10 07:37:17 +02:00
Shadow c8b348e283 Merge branch 'master' of https://github.com/Shadowss/TravianZ 2014-02-03 12:07:46 +02:00
Shadow 4e8a7bf54c folder error 2014-02-03 12:07:13 +02:00
Shadow 7792417362 Update Automation.php 2014-02-02 12:12:59 +02:00
Shadow fbec5c065e Update village.tpl 2014-01-31 08:38:03 +02:00
Shadow 5c1e103431 Update admin.php 2014-01-31 08:29:17 +02:00
Shadow 31faf6f924 Merge branch 'master' of https://github.com/Shadowss/TravianZ
Conflicts:
	Admin/admin.php
2014-01-31 08:20:42 +02:00
Shadow 15182ecb3d fix some things in admin panel 2014-01-31 08:14:15 +02:00
Shadow c9cc7c1f0a Merge pull request #83 from Fannybaws/UpdateCreateUsers
Update create users
2014-01-29 06:43:25 -08:00
Shadow 94f9e374ae Merge pull request #82 from armando1980/patch-35
Reverting Task 18
2014-01-29 06:42:27 -08:00
Shadow f2d2b187bc Merge pull request #81 from armando1980/patch-34
fix quest 18
2014-01-29 06:42:15 -08:00
Shadow 192166ffbd Merge pull request #74 from armando1980/patch-29
FIXED spies BY Armando
2014-01-29 06:40:12 -08:00
armando1980 65c9504ced I made a small mistake and fixed
I made a small mistake

and fixed
2014-01-28 17:12:25 -05:00