Commit graph

743 commits

Author SHA1 Message Date
Francesco Macagno
24f8ce72fb Without quote 2015-09-09 15:32:23 -07:00
Francesco Macagno
b0e27a2846 More modifications 2015-09-09 15:29:10 -07:00
Francesco Macagno
1e1d8dd6f0 Added ssl back in 2015-09-09 15:22:08 -07:00
Francesco Macagno
f9e43f73df Trying to fix user 2015-09-09 15:19:31 -07:00
Francesco Macagno
152c6ccd62 Added encryption 2015-09-09 14:57:11 -07:00
Francesco Macagno
adfb103ecb Added quotes to username 2015-09-09 14:25:28 -07:00
Francesco Macagno
7bd6350be2 Revert "Revert "changed user""
This reverts commit 14724a435a.
2015-09-09 14:24:27 -07:00
Francesco Macagno
14724a435a Revert "changed user"
This reverts commit 2045706a4f.
2015-09-09 14:21:36 -07:00
Francesco Macagno
2045706a4f changed user 2015-09-09 14:13:42 -07:00
Francesco Macagno
bced419272 Fix .jar removal 2015-08-25 21:26:34 -07:00
Francesco Macagno
a22d7f1e59 Remove .jar 2015-08-25 21:22:30 -07:00
Francesco Macagno
ac20007fb8 Add ftp pass 2015-08-25 21:17:51 -07:00
Francesco Macagno
eff9c77a53 More 2015-08-25 21:04:15 -07:00
Francesco Macagno
f60f6dda94 Merge branch 'TravisExperiments' of https://github.com/LemADEC/WarpDrive into TravisExperiments
Conflicts:
	.travis.yml
2015-08-25 21:00:43 -07:00
Francesco Macagno
05e34d9219 More experimenting 2015-08-25 20:59:44 -07:00
Francesco Macagno
03de5a0060 More experimenting 2015-08-25 18:42:03 -07:00
Francesco Macagno
fc18f6660c Moved RELEASE_FILE calc 2015-08-25 18:10:53 -07:00
Francesco Macagno
20ca7b2656 Experimenting 2015-08-25 17:56:32 -07:00
Francescco Macagno
d1f20c5102 Moved to functional server, previous is offline 2015-08-25 15:56:15 -07:00
Francescco Macagno
c2388de7c6 Changed when ftp runs 2015-08-25 15:54:56 -07:00
Francescco Macagno
9f3423b9d3 Experimenting with ftp uploading 2015-08-25 15:51:08 -07:00
Francescco Macagno
b477336116 Fixed a typo 2015-08-25 15:43:45 -07:00
LemADEC
651d2d7549 Fixed #77 planets not loading properly 2015-08-25 22:59:27 +02:00
Francesco Macagno
427ee28ce4 fixed temporary thickness check 2015-08-24 23:30:19 -07:00
Francesco Macagno
07aafb6207 Added some prototype asteroid gen code 2015-08-24 23:22:51 -07:00
Francesco Macagno
6bdd0ab003 Changed name to group in filllerManager 2015-08-24 23:22:35 -07:00
Francesco Macagno
4d6b8828f3 Removed radius check, not relevant right now 2015-08-24 22:52:31 -07:00
Francesco Macagno
d0b799d552 Miscellaneous xml fixes 2015-08-24 22:52:13 -07:00
Francesco Macagno
f877073ae0 Add empty mod string check 2015-08-24 22:06:28 -07:00
Francesco Macagno
c19c2bc696 changed ae2 mod name 2015-08-24 21:43:21 -07:00
Francesco Macagno
99b165b973 Moved IC2 fillers to default 2015-08-24 20:53:56 -07:00
LemADEC
8799a3b1b9 Fixed default filler for IC2 2015-08-24 23:56:01 +02:00
LemADEC
cb10a16830 Version bump to 1.3.5 2015-08-24 11:06:55 +02:00
LemADEC
7a6a17e0bd Fixed minimum distance in ship controller script 2015-08-24 11:01:56 +02:00
LemADEC
2f65b325ec Updated default XML files list
Renamed conf to config
2015-08-24 10:32:01 +02:00
LemADEC
154e52cc33 Fixed UTF-8 encoding 2015-08-24 10:30:48 +02:00
LemADEC
dbacf33e81 Fixed jump in space with air generator activated 2015-08-24 03:18:08 +02:00
LemADEC
84806d8561 Fixed dedicated server support 2015-08-24 00:44:03 +02:00
LemADEC
ecfc535b7f Fixed error message in radar's ping script for CC 2015-08-24 00:44:01 +02:00
Francesco Macagno
9c61ec69f2 Updated remaining xml to new format 2015-08-23 15:01:50 -07:00
Francesco Macagno
2a73da0927 Updated netherores FillerSet 2015-08-23 14:54:26 -07:00
Francesco Macagno
c70e1ac6b7 Added corrupted nether moon 2015-08-23 14:54:10 -07:00
Francesco Macagno
b3bd1b7695 Added SchematicStructure to eventually represent schematics 2015-08-23 14:50:35 -07:00
Francesco Macagno
80fedd2ad2 Removed superflous jd tags 2015-08-23 14:49:39 -07:00
Francesco Macagno
5abfa54809 Added import loading to Orb 2015-08-23 14:49:12 -07:00
Francesco Macagno
f22eeaea53 Merge branch 'MC1.7' of https://github.com/LemADEC/WarpDrive into MC1.7 2015-08-23 14:47:45 -07:00
Francesco Macagno
63380e7d8b Added getFillerSet() 2015-08-23 14:47:42 -07:00
LemADEC
eca46479c9 Fixed controller script crash in teleport menu 2015-08-23 23:41:29 +02:00
Francesco Macagno
aa4602cd6b Updated structures to new format 2015-08-23 14:38:48 -07:00
Francesco Macagno
bf70fe8d25 Changed type to group 2015-08-23 14:38:29 -07:00