From d40e8a280a3de0e0ff7d1f70f7050c28b989a4f6 Mon Sep 17 00:00:00 2001 From: hunterboerner Date: Sat, 9 Nov 2013 16:30:48 -0600 Subject: [PATCH] update changelog file --- changelog.txt | 361 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 230 insertions(+), 131 deletions(-) diff --git a/changelog.txt b/changelog.txt index be643b1..44328de 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,131 +1,230 @@ -Sat Nov 2 12:53:41 2013 -0500 398f8aa (HEAD, develop) -.-  [hunterboerner] -Sat Nov 2 12:51:07 2013 -0500 91662ca Merge branch 'origin/develop'  [hunterboerner] -Sat Nov 2 12:50:35 2013 -0500 a5d32c1 update forge version  [hunterboerner] -Sat Nov 2 16:38:18 2013 +0000 5ceccf5 Worldgen should be done. fixes #25  [sammko] -Sat Nov 2 10:45:19 2013 -0500 f98a644 (origin/lordfokas/doodles) whoops wtf62 :P  [hunterboerner] -Sat Nov 2 10:19:03 2013 -0500 fc94923 pointless method is pointless  [hunterboerner] -Sat Nov 2 14:16:42 2013 +0000 31df802 Crafting finally done. fix'd #26  [sammko] -Sat Nov 2 13:48:49 2013 +0000 80838ae Container refactor  [sammko] -Sat Nov 2 13:29:02 2013 +0000 f9cfbf7 Add crafting components: HyperConductor, a conductive part QuantumPlating, strong stuff MachineCasing, machine casing.  [sammko] -Fri Nov 1 21:51:40 2013 -0500 4362f0e merge moarbetastuff change from betaBlocks to just beta grrrr facepalmtypo remove duplication tabz  [hunterboerner] -Fri Nov 1 21:51:17 2013 -0500 4c6c206 moarbetastuff  [hunterboerner] -Fri Nov 1 21:48:54 2013 -0500 60ed149 change from betaBlocks to just beta  [hunterboerner] -Fri Nov 1 19:50:07 2013 -0500 9eb0049 grrrr  [hunterboerner] -Fri Nov 1 16:36:28 2013 -0500 31c1a72 facepalmtypo  [hunterboerner] -Fri Nov 1 11:55:07 2013 -0500 50e4a13 remove duplication  [hunterboerner] -Fri Nov 1 11:54:56 2013 -0500 f4e1204 tabz  [hunterboerner] -Fri Nov 1 11:04:35 2013 -0500 51aff4a Merge branch 'origin/develop'  [hunterboerner] -Fri Nov 1 10:49:49 2013 -0500 c39e956 needed this  [hunterboerner] -Fri Nov 1 10:47:21 2013 -0500 90085d8 he wasn't using the giant comment  [hunterboerner] -Fri Nov 1 10:39:02 2013 -0500 2416ad7 remove import  [hunterboerner] -Fri Nov 1 10:37:43 2013 -0500 ba1d5f4 remove that  [hunterboerner] -Fri Nov 1 10:37:05 2013 -0500 a87d651 deelectrifier turn off with redstone power  [hunterboerner] -Fri Nov 1 10:30:50 2013 -0500 42cf467 don't need that naow  [hunterboerner] -Fri Nov 1 10:26:20 2013 -0500 57bcfbb implement method  [hunterboerner] -Fri Nov 1 10:26:14 2013 -0500 344fd97 same as before  [hunterboerner] -Fri Nov 1 10:26:10 2013 -0500 47d9cb9 remove shared methods  [hunterboerner] -Fri Nov 1 10:26:03 2013 -0500 2cfc699 move shared methods  [hunterboerner] -Fri Nov 1 10:18:32 2013 -0500 8ac527e fix import  [hunterboerner] -Fri Nov 1 10:18:20 2013 -0500 10ed8da refactor that  [hunterboerner] -Fri Nov 1 10:17:37 2013 -0500 c4dde29 refactor that  [hunterboerner] -Fri Nov 1 10:17:03 2013 -0500 9639d46 refactor dematerializer  [hunterboerner] -Fri Nov 1 10:16:56 2013 -0500 db27ff7 refactor Deenergizer  [hunterboerner] -Fri Nov 1 10:16:50 2013 -0500 f20b740 add set energy  [hunterboerner] -Fri Nov 1 10:13:55 2013 -0500 261356d move that too  [hunterboerner] -Fri Nov 1 10:13:50 2013 -0500 df60367 move that around  [hunterboerner] -Fri Nov 1 10:09:50 2013 -0500 b52592c refactor ftw  [hunterboerner] -Fri Nov 1 10:09:44 2013 -0500 b44f0d6 remove that  [hunterboerner] -Fri Nov 1 10:03:43 2013 -0500 a5bcc6d yeah… I should probably register the TE #67  [hunterboerner] -Fri Nov 1 07:33:26 2013 -0500 7fe1e33 Merge branch 'origin/develop'  [hunterboerner] -Fri Nov 1 07:32:31 2013 -0500 0550aa8 credits  [hunterboerner] -Thu Oct 31 13:26:20 2013 -0500 e7348c8 create instance of TE  [hunterboerner] -Thu Oct 31 13:26:13 2013 -0500 d8f2be2 todos  [hunterboerner] -Thu Oct 31 13:18:26 2013 -0500 9d4d03b refactor  [hunterboerner] -Thu Oct 31 13:18:16 2013 -0500 065930a magic  [hunterboerner] -Thu Oct 31 13:18:07 2013 -0500 b20bea3 magic  [hunterboerner] -Thu Oct 31 13:17:53 2013 -0500 54633e6 remove stuff for new packets  [hunterboerner] -Thu Oct 31 13:17:32 2013 -0500 803c186 work on ION Forge #67  [hunterboerner] -Thu Oct 31 13:16:50 2013 -0500 4aa6376 remove un-needed packets since we haz new  [hunterboerner] -Thu Oct 31 13:16:40 2013 -0500 98a1d01 new packet for all!  [hunterboerner] -Thu Oct 31 13:16:33 2013 -0500 3914450 packetz  [hunterboerner] -Thu Oct 31 13:16:25 2013 -0500 cdb2f00 packtez  [hunterboerner] -Thu Oct 31 13:16:12 2013 -0500 21fb1b0 moar magic  [hunterboerner] -Thu Oct 31 13:15:48 2013 -0500 f365b63 magic!  [hunterboerner] -Thu Oct 31 13:15:25 2013 -0500 bf80d75 intellij magic  [hunterboerner] -Thu Oct 31 13:07:38 2013 -0500 b7e46b9 moving over to new packet  [hunterboerner] -Thu Oct 31 12:54:15 2013 -0500 5c4e826 finish refactoring  [hunterboerner] -Thu Oct 31 12:54:08 2013 -0500 3bacbeb refactor some methods  [hunterboerner] -Thu Oct 31 11:49:54 2013 -0500 1d9d454 don't need Material #67  [hunterboerner] -Thu Oct 31 11:49:43 2013 -0500 caeb227 Loader ION Forge #67  [hunterboerner] -Thu Oct 31 11:48:42 2013 -0500 7dbc5ff configs for ION Forge #67  [hunterboerner] -Thu Oct 31 11:48:15 2013 -0500 6eca8b2 intellij cleanup  [hunterboerner] -Tue Oct 29 20:06:59 2013 -0500 3d32501 I a derp  [hunterboerner] -Tue Oct 29 18:42:24 2013 -0500 423010e basic IONForge Block #67  [Theron Boerner] -Tue Oct 29 18:41:13 2013 -0500 fb50528 bad. no fake TODOs  [Theron Boerner] -Tue Oct 29 18:24:22 2013 -0500 608dae4 sammko hates the header  [Theron Boerner] -Tue Oct 29 18:02:22 2013 -0500 78a038e intellij make things pretty :)  [Theron Boerner] -Tue Oct 29 14:25:51 2013 -0500 80398b3 cleaning!  [Theron Boerner] -Tue Oct 29 12:25:13 2013 -0500 09101f3 fixes #84  [Theron Boerner] -Mon Oct 28 20:44:59 2013 -0500 7686fd8 Quantum De-Electrifier Textures  [Travis] -Thu Oct 24 16:34:21 2013 -0500 ca5036f fixes #73 fixes #81. Add config option for beta blocks and add dislocator as a beta block  [Theron Boerner] -Sun Oct 20 11:14:21 2013 +0200 cccc0a1 Forget it... noone was doing that anyways XD  [sammko] -Sat Oct 19 11:00:01 2013 -0500 a8725b7 nono, that's not powered  [Theron Boerner] -Thu Oct 17 21:13:22 2013 +0200 07fdb80 Work on the QEI GUI some more turn the Quantonium crystal into a chargable item (we dont need 2 machines for discharging now :D)  [sammko] -Thu Oct 17 12:07:49 2013 -0500 df2c93e GitHub not github. Did I mention I fixed the de-electrifier?  [Theron Boerner] -Thu Oct 17 12:04:37 2013 -0500 f5e1695 I am a royal derp  [Theron Boerner] -Thu Oct 17 12:04:29 2013 -0500 7353d6e debug stuff  [Theron Boerner] -Mon Oct 14 19:03:28 2013 +0200 f888b32 lol derp.. shouldnt be changed but added...  [sammko] -Mon Oct 14 18:56:29 2013 +0200 0389209 Fix the energy net, needs extensive testing.  [sammko] -Mon Oct 14 16:57:47 2013 +0200 289e522 Merge branch 'origin/feature/enet'  [sammko] -Sat Sep 28 08:12:54 2013 -0500 f6666b2 update readme for new forge version  [Theron Boerner] -Tue Sep 24 17:02:27 2013 -0500 c93bc65 oh derp, I forgot the texture :P  [Theron Boerner] -Tue Sep 24 17:00:37 2013 -0500 a85db1b rename plutonium to Unbioxenium <- I can't even say that fixes #51  [Theron Boerner] -Tue Sep 24 16:43:59 2013 -0500 2ce0635 update to 1.6.4 fixes #77 Let's hope this works!  [Theron Boerner] -Tue Sep 24 15:05:00 2013 -0500 d05e2cd I no like intellij warnings  [Theron Boerner] -Mon Sep 23 15:02:16 2013 +0100 1fdc389 Starting work on fixing Quantum ENet.  [lordfokas] -Mon Sep 9 08:35:34 2013 +0200 75fe87d PLEASE get rid of that template  [sammko] -Sun Sep 8 14:14:41 2013 +0200 197a9fe Upgrades are broken  [sammko] -Thu Sep 5 16:37:37 2013 +0200 8445ea6 More tooltip stuff  [sammko] -Thu Sep 5 15:46:58 2013 +0200 ad31f8f modify the power bar shape + add support for 4 upgrades (still arent in the gui)  [sammko] -Thu Sep 5 15:12:36 2013 +0200 f833c18 Fix the tooltips  [sammko] -Wed Sep 4 21:58:21 2013 +0200 68e9923 add a power bar  [sammko] -Wed Sep 4 21:19:47 2013 -0500 bf7a352 dropbox did NOT like that file  [Theron Boerner] -Wed Sep 4 15:11:11 2013 -0500 9ebf9bf work on de-electrifier  [Theron Boerner] -Wed Sep 4 21:37:33 2013 +0200 e6d2078 Revert "Attempt to fix jenkins"  [sammko] -Wed Sep 4 21:33:22 2013 +0200 ce901ef Attempt to fix jenkins  [sammko] -Wed Sep 4 19:52:05 2013 +0200 85d6f46 Ugh  [sammko] -Wed Sep 4 19:51:06 2013 +0200 4f91a98 UPDATE TO FORGE .849!!!  [sammko] -Wed Sep 4 19:13:01 2013 +0200 5c80bc7 change package from mods.quantumcraft to just quantumcraft  [sammko] -Wed Sep 4 19:11:02 2013 +0200 cf3c1ba Fix dat  [sammko] -Wed Sep 4 19:09:52 2013 +0200 4669e46 Merge branch 'origin/feature/gui_awesomeness'  [sammko] -Wed Sep 4 18:47:39 2013 +0200 53b2c1a fix the ore rendering and do some more gui stuff  [sammko] -Mon Sep 2 21:32:56 2013 -0500 714dfb9 begin work on the de-electrifier. This class does not get loaded yet so it's not going to break anything either way unless there's a compiler error.  [Theron Boerner] -Mon Sep 2 21:31:57 2013 -0500 5ea5b91 go away whitespace  [Theron Boerner] -Mon Sep 2 16:25:38 2013 -0500 47e70bd limit output to 100 MJ every 10 ticks  [Theron Boerner] -Mon Sep 2 16:23:45 2013 -0500 5c2c853 check for loading correctly  [Theron Boerner] -Mon Sep 2 15:32:50 2013 -0500 d3c091a u no haz free power  [Theron Boerner] -Mon Sep 2 15:12:25 2013 -0500 b2e3bb2 refactor block hardness and resistence  [Theron Boerner] -Mon Sep 2 15:07:47 2013 -0500 ce5b0a2 load after buildcraft but not require it  [Theron Boerner] -Mon Sep 2 14:44:41 2013 -0500 635727a Merge branch 'origin/develop'  [Theron Boerner] -Mon Sep 2 14:42:38 2013 -0500 4935c56 rename machine to tile  [Theron Boerner] -Sun Sep 1 17:31:03 2013 -0500 cabbf95 QEL Textures  [Travis] -Mon Sep 2 09:32:43 2013 -0500 c4aed60 change QElectrifier to QEL  [Theron Boerner] -Mon Sep 2 09:28:00 2013 -0500 0259cc4 fixes #69  [Theron Boerner] -Mon Sep 2 09:21:09 2013 -0500 645e280 check for BuildCaft and then enable the QEL  [Theron Boerner] -Mon Sep 2 09:20:44 2013 -0500 bf37551 ok no requiring  [Theron Boerner] -Mon Sep 2 09:12:42 2013 -0500 e7c6326 require buildcraft  [Theron Boerner] -Sun Sep 1 16:49:06 2013 -0500 cf2ba8d setup QEL textures. Just plop them in and it should work @wtg62 !!!!!  [Theron Boerner] -Sun Sep 1 16:41:21 2013 -0500 bf1b53b clean up  [Theron Boerner] -Sun Sep 1 08:54:19 2013 -0500 6dd4afb crapton of refactoring.  [Theron Boerner] -Sat Aug 31 20:26:16 2013 -0500 a2deb17 uggh build systems  [Theron Boerner] -Sat Aug 31 20:01:02 2013 -0500 28262f6 forgot to update buildcraft in the build.xml  [Theron Boerner] -Sat Aug 31 19:56:19 2013 -0500 f16a06c Fixes #14 however we still need textures.  [Theron Boerner] -Sat Aug 31 19:41:34 2013 -0500 79499fd add block position for getting the Electrifier to work  [Theron Boerner] -Sat Aug 31 11:04:03 2013 -0500 9e14949 save energy buffer fixes #65  [Theron Boerner] -Sat Aug 31 11:03:46 2013 -0500 c6d9f66 purrrty code  [Theron Boerner] -Sat Aug 31 09:37:11 2013 -0500 9aabb05 fixes #63  [Theron Boerner] -Thu Aug 15 10:12:02 2013 -0500 1c12129 temp file holding changelog  [Theron Boerner] -Thu Aug 15 17:09:30 2013 +0200 cd36ce3 test  [sammko] -Thu Aug 15 17:08:21 2013 +0200 0113383 almost finish GuiBase, work on the QEInjector GUI  [sammko] -Thu Aug 15 08:20:18 2013 -0500 65b5446 triggering a build  [Theron Boerner] -Wed Aug 14 20:30:05 2013 +0200 668f847 AWESOME GUI STUFF  [sammko] \ No newline at end of file +Sat Nov 9 16:25:57 2013 -0600 93d1020 (HEAD, origin/develop, release/0.5, develop) Finish 37-render-fibre-wire [hunterboerner] +Sat Nov 9 16:25:48 2013 -0600 eacfd73 register, stuff, it works, who cares. @LordFokas. Tanks for le kode. FIxes #37 [hunterboerner] +Sat Nov 9 15:36:35 2013 -0600 641d39c that's never used [hunterboerner] +Sat Nov 9 15:08:11 2013 -0600 558eb6d go away comment [hunterboerner] +Sat Nov 9 14:53:05 2013 -0600 4164a40 -.- @LordFokas, why did you not see that? :( I feel stupid [hunterboerner] +Thu Nov 7 15:52:39 2013 -0600 c6f7a7b work? [hunterboerner] +Thu Nov 7 15:52:31 2013 -0600 53c7151 Fiber not tube [hunterboerner] +Thu Nov 7 12:04:17 2013 -0600 c643058 moar wark [hunterboerner] +Thu Nov 7 12:01:38 2013 -0600 c856106 a lawt of work [hunterboerner] +Thu Nov 7 11:32:43 2013 -0600 d5e90c4 weird [hunterboerner] +Wed Nov 6 11:43:43 2013 -0600 7bcc332 ion no longer beta! [hunterboerner] +Tue Nov 5 13:10:54 2013 -0600 64d7bd7 change to that fixes #94 [hunterboerner] +Tue Nov 5 13:07:16 2013 -0600 1e4a6be new funnylooking ingot [hunterboerner] +Tue Nov 5 12:25:39 2013 -0600 ffa41d5 derp [hunterboerner] +Tue Nov 5 12:24:17 2013 -0600 df1e1b2 IOF textures [hunterboerner] +Tue Nov 5 12:07:54 2013 -0600 bf2ee05 colorfulingotandyesIknowitsactualyunbiobutrainbowsarefreakingawesome [hunterboerner] +Mon Nov 4 13:15:59 2013 -0600 7af68c6 forgot the tab [hunterboerner] +Mon Nov 4 13:13:54 2013 -0600 e5c2726 alex you broke it [hunterboerner] +Mon Nov 4 13:11:59 2013 -0600 6fb7481 it kinda works! [hunterboerner] +Mon Nov 4 13:10:11 2013 -0600 d0ddac7 that was counterintuitivethingyicantspell [hunterboerner] +Mon Nov 4 13:00:23 2013 -0600 d28a7bf fixes #91 [hunterboerner] +Mon Nov 4 12:51:45 2013 -0600 97957b6 y u break mc! oh wait that was me [hunterboerner] +Sun Nov 3 16:01:38 2013 -0600 0d70b0a location cards are also beta because there's no use for them [hunterboerner] +Sun Nov 3 15:58:57 2013 -0600 f3984eb move that to "beta" [hunterboerner] +Sun Nov 3 15:58:00 2013 -0600 bbcfbdf that annoyed me [hunterboerner] +Sun Nov 3 15:56:39 2013 -0600 de99017 formatting [hunterboerner] +Sun Nov 3 15:56:34 2013 -0600 46ff592 formatting [hunterboerner] +Sun Nov 3 15:56:26 2013 -0600 9b066a7 formatting [hunterboerner] +Sun Nov 3 15:56:17 2013 -0600 5b93838 formatting [hunterboerner] +Sun Nov 3 15:56:10 2013 -0600 87f342f formattign [hunterboerner] +Sun Nov 3 15:50:38 2013 -0600 6d3cdf2 add in new gui image for ionforge [hunterboerner] +Sun Nov 3 15:50:31 2013 -0600 9acf4a5 new gui [hunterboerner] +Sun Nov 3 15:50:21 2013 -0600 3c6c798 move around slots [hunterboerner] +Sun Nov 3 15:32:32 2013 -0600 ecc7fa5 render progress 2 blocks = 2x speed animation [hunterboerner] +Sun Nov 3 15:32:13 2013 -0600 87411b8 progress variable [hunterboerner] +Sun Nov 3 15:25:03 2013 -0600 e5529e1 unused imports [hunterboerner] +Sun Nov 3 15:21:00 2013 -0600 9200b10 remove those comments too [hunterboerner] +Sun Nov 3 15:19:46 2013 -0600 8ae14e9 lol, 0 + h [hunterboerner] +Sun Nov 3 15:17:09 2013 -0600 c16496b go away comments [hunterboerner] +Sun Nov 3 15:14:00 2013 -0600 9d2a9ac don't need that comment anymo [hunterboerner] +Sun Nov 3 15:13:01 2013 -0600 8a22e9a uhyeahitshouldmaybeusepowerotherwiseitswaytooop [hunterboerner] +Sun Nov 3 15:09:12 2013 -0600 a0cbece add config for energy cost of ion forge [hunterboerner] +Sun Nov 3 15:05:54 2013 -0600 20c865c remove comment [hunterboerner] +Sun Nov 3 15:05:50 2013 -0600 ee7d931 add texture [hunterboerner] +Sun Nov 3 14:02:37 2013 -0600 910e983 remove the printlns [hunterboerner] +Sun Nov 3 13:52:39 2013 -0600 8d2a69a my grammar got in the way [hunterboerner] +Sun Nov 3 13:29:44 2013 -0600 b16de67 Finish 67-IONForge WOOT. Just needs gui and textures. [hunterboerner] +Sun Nov 3 13:29:23 2013 -0600 ef61b6f WHOO IT WORKS! close #67 [hunterboerner] +Sun Nov 3 13:10:34 2013 -0600 3925b6a ok, I give up on that [hunterboerner] +Sun Nov 3 13:08:52 2013 -0600 e85595b why is there a

? [hunterboerner] +Sun Nov 3 12:21:15 2013 -0600 a6d3527 ignore the debug messages [hunterboerner] +Sun Nov 3 12:17:51 2013 -0600 0946898 not needed [hunterboerner] +Sun Nov 3 12:10:44 2013 -0600 0b487c2 -.- [hunterboerner] +Sun Nov 3 12:01:27 2013 -0600 e2883bb nbt [hunterboerner] +Sun Nov 3 11:48:18 2013 -0600 3fc48e9 drop contents and remove sout line [hunterboerner] +Sun Nov 3 11:47:44 2013 -0600 71fc945 just a knote [hunterboerner] +Sun Nov 3 11:41:37 2013 -0600 5645722 explanations! [hunterboerner] +Sun Nov 3 11:35:51 2013 -0600 766a177 weird but works [hunterboerner] +Sun Nov 3 11:13:01 2013 -0600 ead298d Merge branch 'origin/develop' [hunterboerner] +Sun Nov 3 09:41:49 2013 -0600 1d3db4a gettin it workin [hunterboerner] +Sun Nov 3 09:29:20 2013 -0600 51fbac0 you didn't see that either [hunterboerner] +Sun Nov 3 09:29:11 2013 -0600 4eda417 you never saw taht [hunterboerner] +Sun Nov 3 09:27:37 2013 -0600 aae4f4c lol he typo'd [hunterboerner] +Sun Nov 3 08:59:31 2013 -0600 b63296d not exactly "working" #67 [hunterboerner] +Sun Nov 3 08:59:06 2013 -0600 4e25a3f move that [hunterboerner] +Sun Nov 3 08:35:49 2013 -0600 124f896 if it's always that then don't say it has to be that! [hunterboerner] +Sun Nov 3 08:28:39 2013 -0600 e2a48a0 this is where it gets weird #67 [hunterboerner] +Sun Nov 3 08:28:26 2013 -0600 18e6800 add more slots #67 [hunterboerner] +Sun Nov 3 08:28:21 2013 -0600 8705734 fix gui derp thingy #67 [hunterboerner] +Sun Nov 3 09:37:25 2013 +0000 b385e48 Shift-rightclicking machines with empty hand NPE fix [sammko] +Sun Nov 3 09:37:03 2013 +0000 7ea66e8 Add a load message. [sammko] +Sat Nov 2 17:52:12 2013 -0500 43b294a spaces! [hunterboerner] +Sat Nov 2 17:52:04 2013 -0500 0229d9d gui stuff kinda [hunterboerner] +Sat Nov 2 16:59:17 2013 -0500 1aa0952 rearrange methods [hunterboerner] +Sat Nov 2 16:59:07 2013 -0500 61de957 add some slots [hunterboerner] +Sat Nov 2 16:59:01 2013 -0500 4cb832e remove un-needed import [hunterboerner] +Sat Nov 2 13:59:46 2013 -0500 7359742 align it [hunterboerner] +Sat Nov 2 13:57:52 2013 -0500 1acd278 don't need that [hunterboerner] +Sat Nov 2 13:56:39 2013 -0500 85dc93e not needed [hunterboerner] +Sat Nov 2 13:50:23 2013 -0500 b863ee4 spacing [hunterboerner] +Sat Nov 2 13:49:58 2013 -0500 1230392 add to proxy [hunterboerner] +Sat Nov 2 13:49:19 2013 -0500 126c120 inventory [hunterboerner] +Sat Nov 2 13:49:14 2013 -0500 be3c479 layout GUI for ionforge #67 [hunterboerner] +Sat Nov 2 13:42:07 2013 -0500 a90c2ea Merge branch 'origin/develop' [hunterboerner] +Sat Nov 2 13:41:51 2013 -0500 c86f4d4 Merge branch 'origin/develop' [hunterboerner] +Sat Nov 2 13:41:18 2013 -0500 0eee7d7 more updated changelog [hunterboerner] +Sat Nov 2 13:33:59 2013 -0500 3a19aff working on tileentity for #67 [hunterboerner] +Sat Nov 2 13:21:09 2013 -0500 019405d grr spaces [hunterboerner] +Sat Nov 2 13:11:31 2013 -0500 3dca22d can't be null [hunterboerner] +Sat Nov 2 13:09:58 2013 -0500 41f5f11 it's gunna have 4 slots [hunterboerner] +Sat Nov 2 13:09:44 2013 -0500 a3028ba Merge branch 'origin/develop' [hunterboerner] +Sat Nov 2 18:03:43 2013 +0000 bc4eaea That was easy. fixes #89 [sammko] +Sat Nov 2 12:53:55 2013 -0500 d38bed0 Merge branch 'origin/develop' [hunterboerner] +Sat Nov 2 12:53:41 2013 -0500 398f8aa -.- [hunterboerner] +Sat Nov 2 12:51:07 2013 -0500 91662ca Merge branch 'origin/develop' [hunterboerner] +Sat Nov 2 12:50:35 2013 -0500 a5d32c1 update forge version [hunterboerner] +Sat Nov 2 16:38:18 2013 +0000 5ceccf5 Worldgen should be done. fixes #25 [sammko] +Sat Nov 2 10:45:29 2013 -0500 d3b7e31 Merge branch 'origin/develop' [hunterboerner] +Sat Nov 2 10:45:19 2013 -0500 f98a644 whoops wtf62 :P [hunterboerner] +Sat Nov 2 10:43:26 2013 -0500 caebcf0 whoops [hunterboerner] +Sat Nov 2 10:38:25 2013 -0500 9898651 more work on that #67 [hunterboerner] +Sat Nov 2 10:38:15 2013 -0500 5254039 start a container #67 [hunterboerner] +Sat Nov 2 10:19:59 2013 -0500 5812df6 Merge branch 'origin/develop' [hunterboerner] +Sat Nov 2 10:19:03 2013 -0500 fc94923 pointless method is pointless [hunterboerner] +Sat Nov 2 10:14:57 2013 -0500 9d3bee2 Merge branch 'origin/develop' [hunterboerner] +Sat Nov 2 14:16:42 2013 +0000 31df802 Crafting finally done. fix'd #26 [sammko] +Sat Nov 2 13:48:49 2013 +0000 80838ae Container refactor [sammko] +Sat Nov 2 13:29:02 2013 +0000 f9cfbf7 Add crafting components: HyperConductor, a conductive part QuantumPlating, strong stuff MachineCasing, machine casing. [sammko] +Fri Nov 1 21:51:40 2013 -0500 4362f0e merge moarbetastuff change from betaBlocks to just beta grrrr facepalmtypo remove duplication tabz [hunterboerner] +Fri Nov 1 21:51:17 2013 -0500 4c6c206 moarbetastuff [hunterboerner] +Fri Nov 1 21:48:54 2013 -0500 60ed149 change from betaBlocks to just beta [hunterboerner] +Fri Nov 1 19:50:07 2013 -0500 9eb0049 grrrr [hunterboerner] +Fri Nov 1 16:36:28 2013 -0500 31c1a72 facepalmtypo [hunterboerner] +Fri Nov 1 11:55:07 2013 -0500 50e4a13 remove duplication [hunterboerner] +Fri Nov 1 11:54:56 2013 -0500 f4e1204 tabz [hunterboerner] +Fri Nov 1 11:04:35 2013 -0500 51aff4a Merge branch 'origin/develop' [hunterboerner] +Fri Nov 1 10:49:49 2013 -0500 c39e956 needed this [hunterboerner] +Fri Nov 1 10:47:21 2013 -0500 90085d8 he wasn't using the giant comment [hunterboerner] +Fri Nov 1 10:39:02 2013 -0500 2416ad7 remove import [hunterboerner] +Fri Nov 1 10:37:43 2013 -0500 ba1d5f4 remove that [hunterboerner] +Fri Nov 1 10:37:05 2013 -0500 a87d651 deelectrifier turn off with redstone power [hunterboerner] +Fri Nov 1 10:30:50 2013 -0500 42cf467 don't need that naow [hunterboerner] +Fri Nov 1 10:26:20 2013 -0500 57bcfbb implement method [hunterboerner] +Fri Nov 1 10:26:14 2013 -0500 344fd97 same as before [hunterboerner] +Fri Nov 1 10:26:10 2013 -0500 47d9cb9 remove shared methods [hunterboerner] +Fri Nov 1 10:26:03 2013 -0500 2cfc699 move shared methods [hunterboerner] +Fri Nov 1 10:18:32 2013 -0500 8ac527e fix import [hunterboerner] +Fri Nov 1 10:18:20 2013 -0500 10ed8da refactor that [hunterboerner] +Fri Nov 1 10:17:37 2013 -0500 c4dde29 refactor that [hunterboerner] +Fri Nov 1 10:17:03 2013 -0500 9639d46 refactor dematerializer [hunterboerner] +Fri Nov 1 10:16:56 2013 -0500 db27ff7 refactor Deenergizer [hunterboerner] +Fri Nov 1 10:16:50 2013 -0500 f20b740 add set energy [hunterboerner] +Fri Nov 1 10:13:55 2013 -0500 261356d move that too [hunterboerner] +Fri Nov 1 10:13:50 2013 -0500 df60367 move that around [hunterboerner] +Fri Nov 1 10:09:50 2013 -0500 b52592c refactor ftw [hunterboerner] +Fri Nov 1 10:09:44 2013 -0500 b44f0d6 remove that [hunterboerner] +Fri Nov 1 10:03:43 2013 -0500 a5bcc6d yeah… I should probably register the TE #67 [hunterboerner] +Fri Nov 1 07:33:26 2013 -0500 7fe1e33 Merge branch 'origin/develop' [hunterboerner] +Fri Nov 1 07:32:31 2013 -0500 0550aa8 credits [hunterboerner] +Thu Oct 31 13:26:20 2013 -0500 e7348c8 create instance of TE [hunterboerner] +Thu Oct 31 13:26:13 2013 -0500 d8f2be2 todos [hunterboerner] +Thu Oct 31 13:18:26 2013 -0500 9d4d03b refactor [hunterboerner] +Thu Oct 31 13:18:16 2013 -0500 065930a magic [hunterboerner] +Thu Oct 31 13:18:07 2013 -0500 b20bea3 magic [hunterboerner] +Thu Oct 31 13:17:53 2013 -0500 54633e6 remove stuff for new packets [hunterboerner] +Thu Oct 31 13:17:32 2013 -0500 803c186 work on ION Forge #67 [hunterboerner] +Thu Oct 31 13:16:50 2013 -0500 4aa6376 remove un-needed packets since we haz new [hunterboerner] +Thu Oct 31 13:16:40 2013 -0500 98a1d01 new packet for all! [hunterboerner] +Thu Oct 31 13:16:33 2013 -0500 3914450 packetz [hunterboerner] +Thu Oct 31 13:16:25 2013 -0500 cdb2f00 packtez [hunterboerner] +Thu Oct 31 13:16:12 2013 -0500 21fb1b0 moar magic [hunterboerner] +Thu Oct 31 13:15:48 2013 -0500 f365b63 magic! [hunterboerner] +Thu Oct 31 13:15:25 2013 -0500 bf80d75 intellij magic [hunterboerner] +Thu Oct 31 13:07:38 2013 -0500 b7e46b9 moving over to new packet [hunterboerner] +Thu Oct 31 12:54:15 2013 -0500 5c4e826 finish refactoring [hunterboerner] +Thu Oct 31 12:54:08 2013 -0500 3bacbeb refactor some methods [hunterboerner] +Thu Oct 31 11:49:54 2013 -0500 1d9d454 don't need Material #67 [hunterboerner] +Thu Oct 31 11:49:43 2013 -0500 caeb227 Loader ION Forge #67 [hunterboerner] +Thu Oct 31 11:48:42 2013 -0500 7dbc5ff configs for ION Forge #67 [hunterboerner] +Thu Oct 31 11:48:15 2013 -0500 6eca8b2 intellij cleanup [hunterboerner] +Tue Oct 29 20:06:59 2013 -0500 3d32501 I a derp [hunterboerner] +Tue Oct 29 18:42:24 2013 -0500 423010e basic IONForge Block #67 [Theron Boerner] +Tue Oct 29 18:41:13 2013 -0500 fb50528 bad. no fake TODOs [Theron Boerner] +Tue Oct 29 18:24:22 2013 -0500 608dae4 sammko hates the header [Theron Boerner] +Tue Oct 29 18:02:22 2013 -0500 78a038e intellij make things pretty :) [Theron Boerner] +Tue Oct 29 14:25:51 2013 -0500 80398b3 cleaning! [Theron Boerner] +Tue Oct 29 12:25:13 2013 -0500 09101f3 fixes #84 [Theron Boerner] +Mon Oct 28 20:44:59 2013 -0500 7686fd8 Quantum De-Electrifier Textures [Travis] +Thu Oct 24 16:34:21 2013 -0500 ca5036f fixes #73 fixes #81. Add config option for beta blocks and add dislocator as a beta block [Theron Boerner] +Sun Oct 20 11:14:21 2013 +0200 cccc0a1 Forget it... noone was doing that anyways XD [sammko] +Sat Oct 19 11:00:01 2013 -0500 a8725b7 nono, that's not powered [Theron Boerner] +Thu Oct 17 21:13:22 2013 +0200 07fdb80 Work on the QEI GUI some more turn the Quantonium crystal into a chargable item (we dont need 2 machines for discharging now :D) [sammko] +Thu Oct 17 12:07:49 2013 -0500 df2c93e GitHub not github. Did I mention I fixed the de-electrifier? [Theron Boerner] +Thu Oct 17 12:04:37 2013 -0500 f5e1695 I am a royal derp [Theron Boerner] +Thu Oct 17 12:04:29 2013 -0500 7353d6e debug stuff [Theron Boerner] +Mon Oct 14 19:03:28 2013 +0200 f888b32 lol derp.. shouldnt be changed but added... [sammko] +Mon Oct 14 18:56:29 2013 +0200 0389209 Fix the energy net, needs extensive testing. [sammko] +Mon Oct 14 16:57:47 2013 +0200 289e522 Merge branch 'origin/feature/enet' [sammko] +Sat Sep 28 08:12:54 2013 -0500 f6666b2 update readme for new forge version [Theron Boerner] +Tue Sep 24 17:02:27 2013 -0500 c93bc65 oh derp, I forgot the texture :P [Theron Boerner] +Tue Sep 24 17:00:37 2013 -0500 a85db1b rename plutonium to Unbioxenium <- I can't even say that fixes #51 [Theron Boerner] +Tue Sep 24 16:43:59 2013 -0500 2ce0635 update to 1.6.4 fixes #77 Let's hope this works! [Theron Boerner] +Tue Sep 24 15:05:00 2013 -0500 d05e2cd I no like intellij warnings [Theron Boerner] +Mon Sep 23 15:02:16 2013 +0100 1fdc389 Starting work on fixing Quantum ENet. [lordfokas] +Mon Sep 9 08:35:34 2013 +0200 75fe87d PLEASE get rid of that template [sammko] +Sun Sep 8 14:14:41 2013 +0200 197a9fe Upgrades are broken [sammko] +Thu Sep 5 16:37:37 2013 +0200 8445ea6 More tooltip stuff [sammko] +Thu Sep 5 15:46:58 2013 +0200 ad31f8f modify the power bar shape + add support for 4 upgrades (still arent in the gui) [sammko] +Thu Sep 5 15:12:36 2013 +0200 f833c18 Fix the tooltips [sammko] +Wed Sep 4 21:58:21 2013 +0200 68e9923 add a power bar [sammko] +Wed Sep 4 21:19:47 2013 -0500 bf7a352 dropbox did NOT like that file [Theron Boerner] +Wed Sep 4 15:11:11 2013 -0500 9ebf9bf work on de-electrifier [Theron Boerner] +Wed Sep 4 21:37:33 2013 +0200 e6d2078 Revert "Attempt to fix jenkins" [sammko] +Wed Sep 4 21:33:22 2013 +0200 ce901ef Attempt to fix jenkins [sammko] +Wed Sep 4 19:52:05 2013 +0200 85d6f46 Ugh [sammko] +Wed Sep 4 19:51:06 2013 +0200 4f91a98 UPDATE TO FORGE .849!!! [sammko] +Wed Sep 4 19:13:01 2013 +0200 5c80bc7 change package from mods.quantumcraft to just quantumcraft [sammko] +Wed Sep 4 19:11:02 2013 +0200 cf3c1ba Fix dat [sammko] +Wed Sep 4 19:09:52 2013 +0200 4669e46 Merge branch 'origin/feature/gui_awesomeness' [sammko] +Wed Sep 4 18:47:39 2013 +0200 53b2c1a fix the ore rendering and do some more gui stuff [sammko] +Mon Sep 2 21:32:56 2013 -0500 714dfb9 begin work on the de-electrifier. This class does not get loaded yet so it's not going to break anything either way unless there's a compiler error. [Theron Boerner] +Mon Sep 2 21:31:57 2013 -0500 5ea5b91 go away whitespace [Theron Boerner] +Mon Sep 2 16:25:38 2013 -0500 47e70bd limit output to 100 MJ every 10 ticks [Theron Boerner] +Mon Sep 2 16:23:45 2013 -0500 5c2c853 check for loading correctly [Theron Boerner] +Mon Sep 2 15:32:50 2013 -0500 d3c091a u no haz free power [Theron Boerner] +Mon Sep 2 15:12:25 2013 -0500 b2e3bb2 refactor block hardness and resistence [Theron Boerner] +Mon Sep 2 15:07:47 2013 -0500 ce5b0a2 load after buildcraft but not require it [Theron Boerner] +Mon Sep 2 14:44:41 2013 -0500 635727a Merge branch 'origin/develop' [Theron Boerner] +Mon Sep 2 14:42:38 2013 -0500 4935c56 rename machine to tile [Theron Boerner] +Sun Sep 1 17:31:03 2013 -0500 cabbf95 QEL Textures [Travis] +Mon Sep 2 09:32:43 2013 -0500 c4aed60 change QElectrifier to QEL [Theron Boerner] +Mon Sep 2 09:28:00 2013 -0500 0259cc4 fixes #69 [Theron Boerner] +Mon Sep 2 09:21:09 2013 -0500 645e280 check for BuildCaft and then enable the QEL [Theron Boerner] +Mon Sep 2 09:20:44 2013 -0500 bf37551 ok no requiring [Theron Boerner] +Mon Sep 2 09:12:42 2013 -0500 e7c6326 require buildcraft [Theron Boerner] +Sun Sep 1 16:49:06 2013 -0500 cf2ba8d setup QEL textures. Just plop them in and it should work @wtg62 !!!!! [Theron Boerner] +Sun Sep 1 16:41:21 2013 -0500 bf1b53b clean up [Theron Boerner] +Sun Sep 1 08:54:19 2013 -0500 6dd4afb crapton of refactoring. [Theron Boerner] +Sat Aug 31 20:26:16 2013 -0500 a2deb17 uggh build systems [Theron Boerner] +Sat Aug 31 20:01:02 2013 -0500 28262f6 forgot to update buildcraft in the build.xml [Theron Boerner] +Sat Aug 31 19:56:19 2013 -0500 f16a06c Fixes #14 however we still need textures. [Theron Boerner] +Sat Aug 31 19:41:34 2013 -0500 79499fd add block position for getting the Electrifier to work [Theron Boerner] +Sat Aug 31 11:04:03 2013 -0500 9e14949 save energy buffer fixes #65 [Theron Boerner] +Sat Aug 31 11:03:46 2013 -0500 c6d9f66 purrrty code [Theron Boerner] +Sat Aug 31 09:37:11 2013 -0500 9aabb05 fixes #63 [Theron Boerner] +Thu Aug 15 10:12:02 2013 -0500 1c12129 temp file holding changelog [Theron Boerner] +Thu Aug 15 17:09:30 2013 +0200 cd36ce3 test [sammko] +Thu Aug 15 17:08:21 2013 +0200 0113383 almost finish GuiBase, work on the QEInjector GUI [sammko] +Thu Aug 15 08:20:18 2013 -0500 65b5446 triggering a build [Theron Boerner] +Wed Aug 14 20:30:05 2013 +0200 668f847 AWESOME GUI STUFF [sammko] \ No newline at end of file