Advertisement
smbarbour

Untitled

Feb 8th, 2013
81
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 13.02 KB | None | 0 0
  1. commit ea2caac6cdc39906e504554899031f4697ae77a1
  2. Author: Scott M. Barbour <smbarbour@gmail.com>
  3. Date: Fri Feb 8 08:07:28 2013 -0600
  4.  
  5. Attempt at making direct download of Optifine work
  6.  
  7. commit 876c99cf23b4b2fccd51f926163a821ad641893c
  8. Author: Scott M. Barbour <smbarbour@gmail.com>
  9. Date: Tue Feb 5 22:45:42 2013 -0600
  10.  
  11. Further cosmetic reorganization
  12.  
  13. commit cbaf2077f90b5e8e31d6b31716eb02f5cbfc376f
  14. Author: Scott M. Barbour <smbarbour@gmail.com>
  15. Date: Tue Feb 5 20:59:28 2013 -0600
  16.  
  17. Breaking down the monolith of the MCUpdater class
  18.  
  19. commit 650c77918f96c558251850b8f3726ccd1e84f1f2
  20. Merge: 35fae76 695a161
  21. Author: Scott M. Barbour <smbarbour@gmail.com>
  22. Date: Mon Feb 4 20:24:23 2013 -0600
  23.  
  24. Merge branch 'develop' of github.com:smbarbour/MCUpdater into develop
  25.  
  26. Conflicts:
  27. mcu/src/org/smbarbour/mcu/MainForm.java
  28.  
  29. commit 35fae762c27a9bcc75cfcd14db07aed20578d2e4
  30. Author: Scott M. Barbour <smbarbour@gmail.com>
  31. Date: Mon Feb 4 20:04:10 2013 -0600
  32.  
  33. Tweaked version detection
  34.  
  35. commit 695a16109ade024c8c489829dd2d06c4532fa768
  36. Author: Scott M. Barbour <smbarbour@gmail.com>
  37. Date: Mon Feb 4 18:06:01 2013 -0600
  38.  
  39. Added server status checking.
  40.  
  41. commit f37528eb1a7dfe7bfafb7d69a0b45394bff5f35f
  42. Merge: e23e057 e68461b
  43. Author: Scott M. Barbour <smbarbour@gmail.com>
  44. Date: Sat Feb 2 16:20:55 2013 -0600
  45.  
  46. Merge branch 'develop' of git@github.com:smbarbour/MCUpdater.git into develop
  47.  
  48. commit e23e057e781ca59164cdd8c4f0c3e40f196055e2
  49. Author: Scott M. Barbour <smbarbour@gmail.com>
  50. Date: Sat Feb 2 16:20:33 2013 -0600
  51.  
  52. Fixed issue with space in user name (non-obvious problem)
  53. Fixed bootstrapping issue when example ServerPack is specified.
  54.  
  55. commit e68461b5c3ed594bdec20a396305fac1f0fa3bf0
  56. Author: Scott M. Barbour <smbarbour@gmail.com>
  57. Date: Fri Feb 1 10:27:27 2013 -0600
  58.  
  59. Disable launch4j task for now.
  60.  
  61. commit e97f6373c6e4cd82ce98b8abb88c732756ebc9e0
  62. Author: Scott M. Barbour <smbarbour@gmail.com>
  63. Date: Fri Feb 1 10:25:50 2013 -0600
  64.  
  65. Revert manifest attribute
  66.  
  67. commit 30fbbb750e762007ebb8112fe8e5b59836ce09ad
  68. Author: Scott M. Barbour <smbarbour@gmail.com>
  69. Date: Fri Feb 1 10:23:57 2013 -0600
  70.  
  71. Hoping for manifest to work properly.
  72.  
  73. commit ad56ef5bdedde6e2956b841c8694568851d8bae1
  74. Author: Scott M. Barbour <smbarbour@gmail.com>
  75. Date: Fri Feb 1 10:18:35 2013 -0600
  76.  
  77. launch4j output during build (hopefully)
  78.  
  79. commit 06127c42b74ed9ef9af7c514129c93a67672ae5e
  80. Author: Scott M. Barbour <smbarbour@gmail.com>
  81. Date: Fri Feb 1 07:51:11 2013 -0600
  82.  
  83. Files in place for launch4j integration.
  84.  
  85. commit 6745b989165fe918dd08dfb1eb92029e04b1ff29
  86. Author: Scott M. Barbour <smbarbour@gmail.com>
  87. Date: Wed Jan 30 13:10:27 2013 -0600
  88.  
  89. Refactor string-based path building to Path.resolve()
  90.  
  91. commit 3dee4b7da2be08f516afd67292c355236ad76e0e
  92. Author: Scott M. Barbour <smbarbour@gmail.com>
  93. Date: Tue Jan 29 21:55:26 2013 -0600
  94.  
  95. Update ant scripts for log4j removal
  96.  
  97. commit b76e7c2a1cbc682d3961523c4e097e9a9e33abd1
  98. Author: Scott M. Barbour <smbarbour@gmail.com>
  99. Date: Tue Jan 29 21:49:34 2013 -0600
  100.  
  101. Remove log4j libraries
  102.  
  103. commit 1d937438491832dc31bee71321fcd41e29dfc40a
  104. Author: Scott M. Barbour <smbarbour@gmail.com>
  105. Date: Tue Jan 29 21:47:52 2013 -0600
  106.  
  107. Changed Log4J to java.util.logging
  108.  
  109. commit 3538f6b3a903a1f7072a646280dabfbbbbc6b448
  110. Author: Scott M. Barbour <smbarbour@gmail.com>
  111. Date: Tue Jan 29 18:06:18 2013 -0600
  112.  
  113. Prevent reading http://www.example.org/ServerPack.xml in MainForm
  114.  
  115. commit fd45f148ad12a0e04fae043eb1ca6b5fe7d936a9
  116. Merge: 51f2ad9 88d4079
  117. Author: Scott M. Barbour <smbarbour@gmail.com>
  118. Date: Tue Jan 29 14:18:47 2013 -0600
  119.  
  120. Merge remote-tracking branch 'origin/develop' into develop
  121.  
  122. commit 51f2ad95f4d026d71d3f39a94efb6694fd602d50
  123. Author: Scott M. Barbour <smbarbour@gmail.com>
  124. Date: Tue Jan 29 14:17:56 2013 -0600
  125.  
  126. ServerUtility: Should import MMC and .minecraft installs a little
  127. cleaner.
  128.  
  129. commit 88d40790ff3badf60d7da52249c5688dbca3590f
  130. Author: Ammon Lauritzen <allaryin@gmail.com>
  131. Date: Tue Jan 29 14:16:28 2013 -0600
  132.  
  133. Fixed references to the old constructor.
  134.  
  135. commit e2fe0284524b28e83c6979eb2b9147d66b3ea928
  136. Author: Scott M. Barbour <smbarbour@gmail.com>
  137. Date: Tue Jan 29 13:56:15 2013 -0600
  138.  
  139. Added old constructor as @Deprecated for quick-fix
  140.  
  141. commit c36b1230c645b82ee0aa03b3c4979bbd743b2d6f
  142. Author: Ammon Lauritzen <allaryin@gmail.com>
  143. Date: Mon Jan 28 17:23:28 2013 -0600
  144.  
  145. Added support for parsing mod side from xml.
  146.  
  147. commit a684b36efd730af173e01dcab1e334c7ac62ad3d
  148. Author: Ammon Lauritzen <allaryin@gmail.com>
  149. Date: Mon Jan 28 17:12:37 2013 -0600
  150.  
  151. Adding entry point for mcucli.
  152.  
  153. commit c77875d5a01e64df3d47d319c3ca5ffa3bbb74b5
  154. Author: Scott M. Barbour <smbarbour@gmail.com>
  155. Date: Mon Jan 28 12:01:43 2013 -0600
  156.  
  157. Exclude .DS_Store entries (Silly Apples)
  158.  
  159. commit 71b00c0bc2f48e40593f4df9d48a89f3da49f7fd
  160. Author: Scott M. Barbour <smbarbour@gmail.com>
  161. Date: Sat Jan 26 10:05:33 2013 -0600
  162.  
  163. Completed dirty flags and prompts
  164.  
  165. commit 6ab4346da12e89826fd0c75054683a0fad375905
  166. Author: Scott M. Barbour <smbarbour@gmail.com>
  167. Date: Fri Jan 25 18:05:32 2013 -0600
  168.  
  169. Prompt to save when switching items in server list (modules and configs
  170. will be next)
  171.  
  172. commit ce089d30501d75ae899d75569aa4da8b2febb228
  173. Author: Scott M. Barbour <smbarbour@gmail.com>
  174. Date: Thu Jan 24 09:50:25 2013 -0600
  175.  
  176. Fixed bootstrapping issue - Read md5.dat in MCUpdater constructor
  177.  
  178. commit 3aafd02678e8e130edd7770cb117ca5b4980d252
  179. Author: Ammon Lauritzen <allaryin@gmail.com>
  180. Date: Wed Jan 23 23:03:06 2013 -0600
  181.  
  182. Fixed version comparison failing when the pack requests the exact build we're running.
  183.  
  184. commit 3137a2fa7d61e134097c94a0dccdc97818723b1f
  185. Author: Scott M. Barbour <smbarbour@gmail.com>
  186. Date: Wed Jan 23 18:00:45 2013 -0600
  187.  
  188. Started work on "dirty" flags
  189.  
  190. commit 199653eed9469133b0240ab2de738abfe777a4ff
  191. Author: Scott M. Barbour <smbarbour@gmail.com>
  192. Date: Wed Jan 23 14:36:39 2013 -0600
  193.  
  194. Minor cleanup of imports and static methods accessed non-statically
  195.  
  196. commit b59efaa839f1d5e006925ac3ecc9a4c9b5f6a374
  197. Author: Scott M. Barbour <smbarbour@gmail.com>
  198. Date: Wed Jan 23 14:15:36 2013 -0600
  199.  
  200. Ant scripts import a common version attribute file
  201.  
  202. commit 58c41f14461279f15566b8e6ca86a3d8c628436a
  203. Author: Scott M. Barbour <smbarbour@gmail.com>
  204. Date: Wed Jan 23 10:14:34 2013 -0600
  205.  
  206. That should do it.
  207.  
  208. commit 9da5a27c651c2766bdf055abf335035a71f69f1a
  209. Author: Scott M. Barbour <smbarbour@gmail.com>
  210. Date: Wed Jan 23 09:52:36 2013 -0600
  211.  
  212. Why is this not working?
  213.  
  214. commit 412d107ad77a42150229e233a40a66c4238a4d34
  215. Author: Scott M. Barbour <smbarbour@gmail.com>
  216. Date: Wed Jan 23 09:48:32 2013 -0600
  217.  
  218. Maybe this will do it?
  219.  
  220. commit f1f1450d031d13398322827d8b2c6008403fe0e3
  221. Author: Scott M. Barbour <smbarbour@gmail.com>
  222. Date: Wed Jan 23 09:44:48 2013 -0600
  223.  
  224. Derp... semi-colons
  225.  
  226. commit a511faa258579c6eefb3f89587a778cf48b129d4
  227. Author: Scott M. Barbour <smbarbour@gmail.com>
  228. Date: Wed Jan 23 09:38:43 2013 -0600
  229.  
  230. This "should" clear old builds from the dist folder
  231.  
  232. commit f4c58e7ffee6d4d9e82371be27d07175316ff8a1
  233. Author: Scott M. Barbour <smbarbour@gmail.com>
  234. Date: Wed Jan 23 07:49:58 2013 -0600
  235.  
  236. Bad property naming
  237.  
  238. commit 8d4135960ac5ef43d79cd5330e1217355c94383f
  239. Merge: 16d1985 7e8135a
  240. Author: Scott M. Barbour <smbarbour@gmail.com>
  241. Date: Wed Jan 23 07:40:54 2013 -0600
  242.  
  243. Merge branch 'develop' of github.com:smbarbour/MCUpdater into develop
  244.  
  245. commit 16d1985e87baf7a549b20a2d4ce0cab86e72bde1
  246. Author: Scott M. Barbour <smbarbour@gmail.com>
  247. Date: Wed Jan 23 07:39:25 2013 -0600
  248.  
  249. Tweaked versioning to make built filename include branch and version
  250. data
  251.  
  252. commit 7e8135a28d43ae8859b9e4ae479ce4f56dac0cac
  253. Author: Scott M. Barbour <smbarbour@gmail.com>
  254. Date: Tue Jan 22 17:12:29 2013 -0600
  255.  
  256. Missing interface file
  257.  
  258. commit 8d67013806c5a22569f0d29fae888b9822e1a3ee
  259. Author: Scott M. Barbour <smbarbour@gmail.com>
  260. Date: Tue Jan 22 17:09:37 2013 -0600
  261.  
  262. Re-enabled use of vanilla launcher for Macs.
  263.  
  264. commit ecbbf8039af2134632cade49ce0e0fc8754132c2
  265. Author: Scott M. Barbour <smbarbour@gmail.com>
  266. Date: Mon Jan 21 17:50:54 2013 -0600
  267.  
  268. Better sorting on the ComboBox, added IntelliSort for Mods
  269.  
  270. commit 0d00475a26686471438f48e5a7689a37e3fa21bf
  271. Author: Scott M. Barbour <smbarbour@gmail.com>
  272. Date: Mon Jan 21 15:03:56 2013 -0600
  273.  
  274. URLs now replace spaces with %20
  275.  
  276. commit 8310c982e1f9f7e269ebf417360b9a5b8c6ae71d
  277. Author: Scott M. Barbour <smbarbour@gmail.com>
  278. Date: Mon Jan 21 12:19:12 2013 -0600
  279.  
  280. Maybe exclude via ant script will work?
  281.  
  282. commit 35a677a3ded838e75cbda36a319d34cabd3c4d3a
  283. Author: Scott M. Barbour <smbarbour@gmail.com>
  284. Date: Mon Jan 21 12:14:22 2013 -0600
  285.  
  286. Removed rogue version.properties file
  287.  
  288. commit 0373b22921c162e6981f1ffdfb981dd5eebb6204
  289. Author: Scott M. Barbour <smbarbour@gmail.com>
  290. Date: Mon Jan 21 12:05:34 2013 -0600
  291.  
  292. Trying to track down the odd version.properties file
  293.  
  294. commit 7645b27850f3a5b337bc97126939f5798595d449
  295. Author: Scott M. Barbour <smbarbour@gmail.com>
  296. Date: Mon Jan 21 12:00:12 2013 -0600
  297.  
  298. Now opens existing XML files.
  299.  
  300. commit 1f184365cde2872f0e8ce12e997f88f3033e46f8
  301. Author: Scott M. Barbour <smbarbour@gmail.com>
  302. Date: Mon Jan 21 02:50:11 2013 -0600
  303.  
  304. Update build-serverutility.xml
  305.  
  306. commit 6fe3ac28e5758a50cfc484e70fad92c7ba4291c9
  307. Author: Scott M. Barbour <smbarbour@gmail.com>
  308. Date: Mon Jan 21 02:45:09 2013 -0600
  309.  
  310. Added assets.zip to ServerUtility
  311.  
  312. commit 63cb01ba22741161d38c4a9b8a4784b7fe2ee4b7
  313. Author: Scott M. Barbour <smbarbour@gmail.com>
  314. Date: Mon Jan 21 02:30:25 2013 -0600
  315.  
  316. Update build-serverutility.xml
  317.  
  318. commit 537b24b81d4433ccaef702d2fe23cbdfe1d8f71e
  319. Author: Scott M. Barbour <smbarbour@gmail.com>
  320. Date: Mon Jan 21 02:16:35 2013 -0600
  321.  
  322. New ant script for ServerUtility
  323.  
  324. commit 8d6669fda6c2e326ea2bf9b543cb35e9cc21b0b7
  325. Author: Scott M. Barbour <smbarbour@gmail.com>
  326. Date: Mon Jan 21 02:06:47 2013 -0600
  327.  
  328. Added multi-server pack support
  329.  
  330. commit 2758de9121121fa2b2836f5914bb4f1ad066e674
  331. Author: Scott M. Barbour <smbarbour@gmail.com>
  332. Date: Sun Jan 20 11:30:11 2013 -0600
  333.  
  334. ServerUtility now writes the XML.
  335.  
  336. commit 2ab163c77388f8489e193e717a5b9761848a4c8a
  337. Author: Scott M. Barbour <smbarbour@gmail.com>
  338. Date: Sun Jan 20 07:44:06 2013 -0600
  339.  
  340. ServerUtility now reads a directory and fills in the blanks accordingly.
  341. GUI fully functional
  342. No XML output yet.
  343.  
  344. commit 646185fbed8eb5337a53fff339231788d83b096c
  345. Merge: bd549c8 79c47fb
  346. Author: Scott M. Barbour <smbarbour@gmail.com>
  347. Date: Fri Jan 18 22:36:12 2013 -0600
  348.  
  349. Merge remote-tracking branch 'origin/develop' into ServerUtility
  350.  
  351. commit 79c47fbf8e9b19a505d91d6f1ee67f15ebba5c28
  352. Author: Scott M. Barbour <smbarbour@gmail.com>
  353. Date: Fri Jan 18 17:38:22 2013 -0600
  354.  
  355. Update MCU-API/src/org/smbarbour/mcu/util/MCUpdater.java
  356.  
  357. commit 7ae5e9df9ca771ca88240524da0f951ad2bfa2cf
  358. Author: Scott M. Barbour <smbarbour@gmail.com>
  359. Date: Wed Jan 16 17:09:39 2013 -0600
  360.  
  361. Password retention
  362. Auto-login if password is saved.
  363.  
  364. commit 674a9d10b22bd0a7aad9c1f1c982f3e9fc5977b5
  365. Author: Scott M. Barbour <smbarbour@gmail.com>
  366. Date: Wed Jan 16 15:47:16 2013 -0600
  367.  
  368. Login logic moved to MainForm and a little eye candy.
  369.  
  370. commit bd549c8016d107c4bb479284cfa204ecd37bfdeb
  371. Author: Scott M. Barbour <smbarbour@gmail.com>
  372. Date: Wed Jan 16 14:34:11 2013 -0600
  373.  
  374. Add 'depends' attribute for Module element
  375.  
  376. commit aa967213c3a66e8f226b111a5850c56d83e062a3
  377. Author: Scott M. Barbour <smbarbour@gmail.com>
  378. Date: Wed Jan 16 10:46:50 2013 -0600
  379.  
  380. Relative paths to libraries are a good thing.
  381.  
  382. commit 3d64378f26771292d62003e9b2b3db9c828296e6
  383. Author: Scott M. Barbour <smbarbour@gmail.com>
  384. Date: Wed Jan 16 02:10:47 2013 -0600
  385.  
  386. More work on ServerPack tools
  387.  
  388. commit 0d52c7912a1193dce9a963383fc376f294bfc1e8
  389. Author: Scott M. Barbour <smbarbour@gmail.com>
  390. Date: Tue Jan 15 19:38:08 2013 -0600
  391.  
  392. Added "id" attribute to Module element
  393. MCU-API version 2.2
  394.  
  395. commit b1663d7534a1684bb34d69b1ec833d964ae8d410
  396. Author: Scott M. Barbour <smbarbour@gmail.com>
  397. Date: Tue Jan 15 17:49:31 2013 -0600
  398.  
  399. Updated ServerUtility to current state of API
  400.  
  401. commit e49b8219baa51a1a6a3d3dff1d05778e34816aff
  402. Merge: 21d25f6 5c59d95
  403. Author: Scott M. Barbour <smbarbour@gmail.com>
  404. Date: Tue Jan 15 17:35:09 2013 -0600
  405.  
  406. Merge remote-tracking branch 'origin/develop' into develop
  407.  
  408. commit 21d25f6a878aa5438cb5fa235c7d918783de75ab
  409. Author: Scott M. Barbour <smbarbour@gmail.com>
  410. Date: Tue Jan 15 17:34:05 2013 -0600
  411.  
  412. Add assets-API.zip to repo
  413.  
  414. commit c1df216afc0753c6bb863c258f95679183b5916b
  415. Author: Scott M. Barbour <smbarbour@gmail.com>
  416. Date: Tue Jan 15 17:32:07 2013 -0600
  417.  
  418. Default instance icon now in assets.
  419.  
  420. commit 5c59d95bfe470515d341556923993c0c12f5dd8f
  421. Author: Ammon Lauritzen <allaryin@gmail.com>
  422. Date: Tue Jan 15 02:03:59 2013 -0600
  423.  
  424. Moved version info into its own class in the api project.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement