summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities (follow)
Commit message (Expand)AuthorAgeFilesLines
* Use pitch lookup in noteblock block entity (#4826)12xx122020-09-052-45/+80
* Streamline startup sequenceTiger Wang2020-09-051-1/+1
* Remove redundant DoWithChunkAt in chestsTiger Wang2020-08-282-12/+6
* Remove unused variables in ChestEntity/BlockEntityWithItemsTiger Wang2020-08-212-4/+0
* Add Statistics and Achievements for newer Network standards12xx122020-08-191-1/+1
* Remove the redstone solid block handlerTiger Wang2020-08-082-8/+2
* Always use relative coordinates in AddBlockTiger Wang2020-08-023-42/+44
* Replaced cpp14::make_unique<> with std::make_unique<>.Mattes D2020-08-011-19/+19
* Call BlockEntityWithItems from ChestEntity slot changed handlerTiger Wang2020-07-262-37/+53
* Precompile unordered_map/setTiger Wang2020-07-191-1/+0
* Upgrade to C++17 [CMake] (#4717)Tiger Wang2020-05-161-8/+2
* Enable some more clang-tidy linter checks (#4738)peterbell102020-05-153-14/+2
* Update submodules (#4727)peterbell102020-05-091-1/+1
* Update DispenserEntity.cppLukas Pioch2020-04-251-1/+1
* Fixed spawning of mobs from dispenserLukas Pioch2020-04-251-2/+3
* Using Super.Mattes D2020-04-1637-59/+59
* Block entity for beacon was not created (#4618)Lukas Pioch2020-04-041-0/+1
* Manage block entity lifetime with unique_ptr (#4080)peterbell102020-04-032-29/+29
* Pulled the BlockID and BlockInfo headers from Globals.h. (#4591)Mattes D2020-04-036-3/+8
* Lock hopper when powered by redstone (#4347)Bond-0092020-03-272-4/+25
* Play sound when brewing is completeMat2020-03-231-0/+1
* Jukebox improvements (#4537)Mat2020-03-232-4/+23
* Don't remove items twice (#4524)Mat2020-03-221-1/+1
* Remove leading slash from command block commands (#4502)Mat2020-03-191-6/+20
* Prevent container item duplication (#4476)Mat2020-03-042-15/+0
* Moved growing from cWorld / cChunk to cBlockHandler descendants.Mattes D2019-10-283-22/+22
* Fixed crash in hopper while pulling items from blockentity above itself (#4412)NiLSPACE2019-10-041-2/+2
* Refactored more of Entities and BlockEntities to use Vector3. (#4403)Mattes D2019-09-2938-399/+420
* Wake up redstone simulator on slot changes for blockentities (#4348)Bond-0092019-08-112-0/+16
* Add a formatting function for Vector3 (#4282)peterbell102018-09-242-7/+7
* Force all headers other than "Globals.h" to be included with relative paths (#4269)peterbell102018-08-296-9/+6
* cWorld: Manually bind deprecated broadcast functions (#4265)peterbell102018-07-272-3/+3
* CheckBasicStyle: Check number of empty lines between functions (#4267)peterbell102018-07-266-12/+4
* Broadcast refactor (#4264)peterbell102018-07-241-4/+2
* Prefer static_cast to reinterpret_cast (#4223)peterbell102018-05-0215-15/+15
* Smelting Gives Experience (#4094)Alex Sweet2018-04-112-0/+25
* Add the fmt library (#4065)peterbell102018-01-031-0/+1
* cChunkInterface GetBlock, GetBlockMeta, GetBlockTypeMeta use vectors (#4050)Bond-0092017-11-201-4/+3
* Fixed 2 small warnings (#4055)Bond-0092017-10-022-7/+3
* BroadcastBlockBreakAnimation and BroadcastBlockEntity use vectors (#4038)Bond-0092017-09-255-14/+12
* Changed BroadcastSoundEffect, SendSoundEffect, and CastThunderbolt parameters to vectors (#3959)Lane Kolbly2017-09-192-6/+4
* Removed UTF-8 BOM (#4033)Lukas Pioch2017-09-192-2/+2
* Fix switch warnings (#4013)peterbell102017-09-142-10/+12
* Replace ItemCallbacks with lambdas (#3993)peterbell102017-09-114-107/+43
* Changed some int parameters to vector parameters (#3937)Bond-0092017-09-071-2/+2
* Revert "Replace ItemCallbacks with lambdas (#3948)"LogicParrot2017-09-024-43/+107
* Replace ItemCallbacks with lambdas (#3948)peterbell102017-09-014-107/+43
* Add cUUID class (#3871)peterbell102017-08-252-9/+14
* Award player an achievement when creating a beacon (#3930)Bond-0092017-08-211-13/+36
* cBeaconEntity fix no world crashpeterbell102017-08-181-1/+4
* Merge pull request #3489 from cuberite/EntityOwnershipTiger Wang2017-08-181-2/+2
|\
| * Changed entity ownership model to use smart pointersTiger Wang2017-08-071-2/+2
* | Sitting cats block enderchests from opening (#3906)Bond-0092017-08-172-25/+11
|/
* Removed double includes (#3885)Lukas Pioch2017-08-021-1/+0
* Added basic ocelot behavior (#3829)Bond-0092017-07-121-2/+29
* Added bed entity (#3823)Lukas Pioch2017-07-074-0/+106
* Added 1.12 blocks (#3760)Bond-0092017-06-302-3/+41
* cBlockArea supports block entities. (#3795)Mattes D2017-06-242-3/+56
* Fixed missing "override"Mattes D2017-06-161-1/+1
* BlockEntities: Support cloning self.Mattes D2017-06-1637-231/+538
* FastRandom rewrite (#3754)peterbell102017-06-132-7/+7
* Fixes problems with windows:Lukas Pioch2017-06-057-7/+7
* Fixed double chests (#3741)peterbell102017-06-032-7/+24
* Minor cBrewingRecipes cleanup (#3731)peterbell102017-05-281-4/+4
* Double chest window fix (#3735)peterbell102017-05-282-52/+130
* Broadcast mob head changesmathiascode2017-05-281-0/+5
* Exported boatLukas Pioch2017-05-241-1/+6
* Clang 5.0 fixesLukas Pioch2017-05-217-7/+7
* Fixed invisible chests (#3722)Pablo Beltrán2017-05-213-5/+15
* Corrected brewingstand and added support for fuelLukas Pioch2017-05-082-19/+66
* Added a nullptr check to cEntity::IsA (#3659)Marvin Kopf2017-04-011-1/+1
* Fireworks can be fired from a dispenserBond-0092017-03-221-1/+4
* Updated sounds and effect IDs (#3422)mathiascode2017-02-153-10/+10
* Added some blocks and items (#3503)mathiascode2017-02-141-8/+118
* Fixed bindings for cBlockArea:Read and Write. (#3568)Mattes D2017-02-051-1/+1
* Removed ClientHandle.h dependencies from common headers.Mattes D2016-11-185-6/+12
* Fixed type-casting-related warnings.Mattes D2016-08-241-2/+1
* CMake: Remove needless minimum version specifications.Mattes D2016-07-181-2/+0
* Updated API documentation.Mattes D2016-07-182-4/+4
* - Add a activation flag to droppers and dispensers. Previously droppers and dispensers shot items with every block update.QUSpilPrgm2016-06-152-4/+4
* Update Dispensers and let them act more like in VanillaQUSpilPrgm2016-06-032-10/+81
* Reduced unnecessary block updatesLogicParrot2016-04-222-2/+1
* Proper entity destruction in non-ticking chunksLogicParrot2016-02-191-1/+1
* Bulk clearing of whitespaceLogicParrot2016-02-0520-159/+159
* Changed the format of the MobHead data to allow MobHeads working on MInecraft 1.8bibo382016-01-112-11/+56
* Renamed leftover strings to Cuberite / Server, as needed.Mattes D2016-01-011-1/+1
* Reorganised the redstone simulatorTiger Wang2015-12-188-89/+4
* Moved variables into scope, removed unused variables and fixed variablesLukas Pioch2015-12-171-1/+1
* allow use failures to propagate from the entity/block to the playerGargaj2015-12-1329-33/+52
* Add enum for Sound and Particle EffectsDave Tucker2015-11-243-10/+12
* Fix memory leakworktycho2015-11-081-1/+1
* Implemented brewingLukas Pioch2015-11-034-0/+449
* Update Loops required for JsonCPPLukas Pioch2015-10-261-2/+2
* Added CircleCI for stylechecking.Mattes D2015-09-172-4/+24
* Fixes #2485Tiger Wang2015-09-021-1/+0
* Unified the doxy-comment format.Mattes D2015-07-319-60/+49
* Silenced and fixed many warning messages across multiple files.Samuel Barney2015-07-292-4/+4
* Spawn baby mobshallucino2015-07-161-1/+1
* Fixed DropSpenser sound #2333mmdk952015-07-121-2/+2
* (Ender) Chests are obstructed by opaque blocks.Nounours Heureux2015-07-072-15/+13
* Merge pull request #2224 from cuberite/ChunkQueueCollapsingworktycho2015-07-041-0/+1
|\
| * Reinstate "Chunk queue collapsing"Tiger Wang2015-06-101-0/+1
* | Fixes #2245Tiger Wang2015-06-171-1/+1
* | Fixed overridetycho2015-06-151-1/+1
|/
* Merge pull request #2144 from mc-server/comparatorsAlexander Harkness2015-06-092-1/+19
|\
| * ComparatorsTiger Wang2015-06-062-1/+19
* | Revert "Chunk queue collapsing"worktycho2015-06-071-1/+0
* | Rewrote ChunkSending queue for significantly improved performancetycho2015-06-051-0/+1
* | Fixes multiple furnace issues, including from loading world storageHaoTNN2015-06-032-14/+37
* | Merge branch 'master' of https://github.com/mc-server/MCServerHaoTNN2015-06-034-11/+29
|\|
| * Fix commentstycho2015-05-282-6/+9
| * Made -Weverything an error.tycho2015-05-243-9/+19
| * Merge branch 'master' into PreventNewWarningstycho2015-05-232-2/+2
| |\
| * | Make -Werror disabling file onlytycho2015-05-192-2/+7
* | | Merge remote-tracking branch 'upstream/master'HaoTNN2015-05-232-2/+2
|\ \ \ | | |/ | |/|
| * | Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.Lukas Pioch2015-05-232-2/+2
| |/
* / Fixes lit furnace issue in #2051haotnn2015-05-191-0/+1
|/
* Improved hoppersTiger Wang2015-05-112-27/+16
* More style checking.Mattes D2015-05-092-2/+2
* Merge pull request #1826 from mc-server/UnifyPacketizerMattes D2015-03-243-14/+28
|\
| * Changed cEntity::m_UniqueID to UInt32.Mattes D2015-03-213-14/+28
* | Correct world height validations.Tommy Santerre2015-03-201-2/+2
|/
* Removed unwanted base classes from Lua API.Mattes D2015-03-191-0/+2
* Moved window code into cpp filesHowaner2015-03-101-1/+1
* Merge branch 'master' into InventoryHowaner2015-01-2513-13/+13
|\
| * Initial convertion of a_Dt to std::chronoTycho2015-01-1113-13/+13
* | Merge branch 'master' into InventoryHowaner2014-12-171-2/+2
|\|
| * NULL -> nullptrTiger Wang2014-12-171-2/+2
* | Own classes for all windows.Howaner2014-12-136-3/+6
|/
* MobSpawner fixes.Howaner2014-12-013-3/+10
* Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes.Howaner2014-11-293-57/+12
* Merge branch 'master' into MobSpawnerHowaner2014-11-2916-24/+25
|\
| * BlockEntities: Removed the extra semicolon.Mattes D2014-11-2716-24/+25
* | Finished mob spawner implementation.Howaner2014-11-1813-121/+10
* | Merge branch 'master' into MobSpawnerHowaner2014-11-1831-735/+274
|\|
| * En masse NULL -> nullptr replaceTiger Wang2014-10-2316-54/+64
| * Fixed trailing whitespace.Mattes D2014-10-212-2/+2
| * Merged branch 'master' of git://github.com/sriehl/MCServerMattes D2014-10-218-97/+64
| |\
| | * fix std:min call, include algorithm and compare same typeSteven Riehl2014-10-121-2/+2
| | * refactor an if block to std::minSteven Riehl2014-10-121-4/+1
| | * convert old style casts to fix warningsSteven Riehl2014-10-128-105/+74
| * | cLuaState: cBlockEntity descendants are pushed with proper class type.Mattes D2014-10-1916-25/+62
| * | Furnaces now update their block entity typeTiger Wang2014-10-181-2/+4
| * | Simpler code.Alexander Harkness2014-10-181-3/+2
| * | Nullptr?Alexander Harkness2014-10-161-2/+2
| * | Fixed a number of stylistic issues.Alexander Harkness2014-10-161-7/+7
| * | Improved furnacesTiger Wang2014-10-032-142/+109
| |/
| * Removed WSSCompactTiger Wang2014-09-3024-437/+0
| * Compilation fixTiger Wang2014-09-281-2/+2
| * SuggestionsTiger Wang2014-09-273-9/+8
| * Merge remote-tracking branch 'origin/master' into chestcartsTiger Wang2014-09-2724-41/+19
| |\
| * | Implemented Chest MinecartsTiger Wang2014-09-137-7/+2
* | | Fixed compile errors.Howaner2014-09-272-42/+42
* | | Merge branch 'master' into MobSpawnerHowaner2014-09-2624-41/+19
|\ \ \ | | |/ | |/|
| * | Removed more unessicary includesTycho2014-09-2622-35/+12
| * | Merge pull request #1419 from mc-server/redstoneTestsworktycho2014-09-262-4/+5
| |\ \
| | * | Added first test to show the object can be createdTycho2014-09-171-1/+1
| | * | Possibly decoupled IncrementalRedstoneSimulator from the rest of the serverTycho2014-09-112-4/+5
| | |/
| * | Fixed dispender direction bugHowaner2014-09-251-1/+1
| * | A few compiler warning fixesChris Darnell2014-09-231-1/+1
| |/
* | Implemented mob spawner.Howaner2014-09-193-43/+323
* | Created MobSpawnerEntity class.Howaner2014-09-174-1/+165
|/
* Added Y-wise asserts to signs.Mattes D2014-09-061-0/+1
* Merge pull request #1365 from mc-server/coverityFixesMattes D2014-09-011-5/+4
|\
| * Fixed style.madmaxoft2014-09-011-1/+2
| * Changed null check to assertworktycho2014-08-311-5/+3
* | Rewrited furnace.txt loading.Howaner2014-08-311-1/+1
|/
* Fixed style.madmaxoft2014-08-301-2/+3
* Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-08-294-9/+38
|\
| * Fixed potential null dereferenceTycho2014-08-101-5/+5
| * Fixed style issuesTycho2014-08-062-2/+5
| * Fixed multiple inhertance being output by toluaTycho2014-08-062-6/+10
| * Removed dependecy of redstone simulator on NoteBlockTycho2014-08-052-1/+13
| * Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity DirectlyTycho2014-08-052-3/+13
* | Improved command block securityTiger Wang2014-08-291-6/+19
|/
* Fixed a bug who can used from hacked clients.Howaner2014-08-021-0/+2
* Use "default:" in switch.Howaner2014-07-311-3/+6
* Renamed "select..." methods to "set..." and better IsValidEffect() function.Howaner2014-07-312-51/+15
* Updated documentation.Howaner2014-07-311-3/+3
* Renamed functions and added beacon json saving.Howaner2014-07-312-46/+44
* Added window update.Howaner2014-07-301-0/+23
* Added beacon load/save.Howaner2014-07-301-0/+3
* Changed return type from GetPrimaryPotion() and GetSecondaryPotion()Howaner2014-07-301-2/+2
* Exported the beacon.Howaner2014-07-302-17/+27
* Added beacon.Howaner2014-07-303-32/+337
* Removed redundant semicolons and re-added warningarchshift2014-07-243-4/+4
* Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-218-12/+12
* Code style: Fixed braces on separate lines.madmaxoft2014-07-193-3/+6
* Subdirs: Only add_library if not using MSVCarchshift2014-07-191-1/+3
* BlockEntities/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+35
* Fixed spaces before commas.madmaxoft2014-07-181-2/+2
* Basic style fixes.madmaxoft2014-07-1710-11/+11
* Normalized comments.madmaxoft2014-07-174-10/+10
* Fixed a DropSpenser AddFace bugTiger Wang2014-07-151-1/+1
* Pass cItem by reference.madmaxoft2014-07-151-1/+1
* Fixed Issue with Comparing agast the wrong chest, potentially causing crashes.worktycho2014-07-131-7/+7
* Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-131-1/+1
* cHopperEntity: Simplified chest conditions.madmaxoft2014-07-121-10/+4
* cChestEntity: Renamed a member to avoid confusion.madmaxoft2014-07-122-8/+9
* Fixed alignment.madmaxoft2014-07-121-2/+3
* Suggestions and bug fixTiger Wang2014-07-122-10/+18
* SuggestionsTiger Wang2014-07-111-4/+4
* Made things consistentTiger Wang2014-07-081-4/+5
* Implemented trapped chests & othersTiger Wang2014-07-074-13/+36
* Properly implemented enderchestsTiger Wang2014-06-292-93/+44
* Fixed crashes in HopperEntity.Mattes D2014-06-241-19/+58
* Chests don't open if obstructedTiger Wang2014-06-221-0/+13
* Merge branch 'master' into GlobalFixesHowaner2014-06-172-22/+94
|\
| * DispenserEntity code cleanup after PR merge.madmaxoft2014-06-112-30/+30
| * - Fixed a lot of alignmentJoannisO2014-06-051-7/+7
| * - Removed the code that removed fireworks from a dispenser even thoughtJoannisO2014-06-041-3/+0
| * - Fixed variable names in a function.JoannisO2014-06-041-2/+2
| * - Fixed a lot of astethicsJoannisO2014-06-042-14/+17
| * - Fixed an issue where there were 2 "DispChunk"-s in the same function.JoannisO2014-06-031-16/+5
| * - Fixed a bug where I didn't return anything in the GetShootVectorJoannisO2014-06-031-0/+2
| * - Fixed a bug where I used the FireCharge ITEM instead of the ProjectileJoannisO2014-06-031-1/+1
| * - Cleaned up the code massivelyJoannisO2014-06-032-90/+31
| * - Added doxy comments and exported to luaJoannis2014-06-032-22/+64
| * - Changed the name of the ProjectileLookVector method.JoannisO2014-05-312-3/+3
| * - Prefixed all args with "a_"JoannisO2014-05-292-6/+10
| * - Removed breaks. I thought it wouldn't compile without them but theJoannisO2014-05-281-2/+0
| * - Fixed an issue where dispensers would only shoot arrows (appearantlyJoannisO2014-05-281-33/+24
| * - Implemented vertical dispensing for projectiles.Joannis2014-05-282-16/+40
| * - Fixed the ampersands and asterisks to fit the format.Joannis2014-05-272-8/+8
| * - Added support for more types of projectiles in the DispenserJoannisO2014-05-262-38/+51
| * Added Arrow- and FireCharge-Dispensing to DispenserEntity.JoannisO2014-05-262-27/+95
* | Code improvementsHowaner2014-05-281-5/+2
* | Fix skull bugs.Howaner2014-05-281-0/+5
|/
* Added static const, initialized fields.archshift2014-04-272-1/+4
* Cmake generated projects for IDEs include headers in project files.archshift2014-04-251-0/+1
* Merge pull request #909 from jfhumann/fixesMattes D2014-04-223-11/+16
|\
| * Fixed Flint and Steel, reverted Minecart change, renamed a parameter namejfhumann2014-04-191-5/+5
| * Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-183-8/+13
* | Fixed formatting, made function static.madmaxoft2014-04-192-13/+18
* | Some tweaksSTRWarrior2014-04-121-5/+17
* | Removed debug message.STRWarrior2014-04-121-1/+0
* | Simplefied GetPyramidLevelSTRWarrior2014-04-121-10/+3
* | Implemented the skeleton code for the beacon.STRWarrior2014-04-123-0/+153
|/
* Fixed a few MSVC type warnings.Mattes D2014-04-031-1/+1
* Fixed double to float conversions.madmaxoft2014-03-161-1/+1
* Add fireball interactHowaner2014-03-141-0/+6
* Change TNT Fuse to ticksHowaner2014-03-081-1/+1
* Add Flower PotsHowaner2014-03-073-0/+210
* Documented the changes in cJukeboxEntity.madmaxoft2014-02-281-2/+3
* Merge pull request #709 from Howaner/GlobalFixesMattes D2014-02-282-16/+48
|\
| * Better Jukebox APIHowaner2014-02-212-16/+48
* | Fixed compilation in MSVC (forward class definitions).madmaxoft2014-02-242-0/+2
* | BlockEntities is warnings freeTycho2014-02-246-3/+11
|/
* Rename SkullEntity to MobHeadEntityHowaner2014-02-195-189/+189
* Add break to Protocol17x.cpp and use new comment delimiterHowaner2014-02-191-7/+7
* Add Heads completelyHowaner2014-02-183-5/+3
* Add Skulls/HeadsHowaner2014-02-173-0/+191
* Fixed typographical errorTiger Wang2014-02-151-2/+1
* Removed debug messages againTiger Wang2014-02-151-6/+0
* Added proper debug messagesTiger Wang2014-02-131-3/+8
* Fancy stuff with constant referencesTiger Wang2014-02-131-2/+2
* Added more missing GetClassStatic()sTiger Wang2014-02-122-0/+4
* Removed some unneeded BroadcastWholeWindow()sTiger Wang2014-02-124-23/+2
* Changed inheritance a bitTiger Wang2014-02-127-33/+47
* Fixed #190Tiger Wang2014-02-111-2/+67
* Fixed #612Tiger Wang2014-02-112-0/+16
* Minor style improvements for the merged PR.Mattes D2014-01-231-4/+4
* Command block fixes 2andrew2014-01-231-6/+20
* Removed unneeded paramtersTiger Wang2014-01-191-1/+1
* Changed SendBlockEntity format slightlyTiger Wang2014-01-191-24/+2
* Improved command blocksTiger Wang2014-01-191-5/+37
* Command block fixesandrew2014-01-182-38/+5
* Parse the MC|AdvCdm plugin messageandrew2014-01-181-0/+2
* Command blocks: Execute()andrew2014-01-181-5/+27
* Command block (de)serializationandrew2014-01-182-3/+42
* Basic command block implementationandrew2014-01-183-11/+271
* Removed obsoleted functionsTiger Wang2014-01-162-4/+4
* Fixed a few MSVC warnings.madmaxoft2014-01-062-5/+4
* Fixed compilation in VC2008.madmaxoft2013-12-301-2/+1
* converted commneted paramater names to the unused macroTycho Bickerstaff2013-12-222-2/+8
* Chunk is now warnings cleanTycho Bickerstaff2013-12-213-3/+3
* fixed hidden bug with furnaces ignoring time burntTycho Bickerstaff2013-12-211-1/+1
* ChunkSender is now warnings cleanTycho Bickerstaff2013-12-211-1/+1
* Merge branch 'master' into cmakeTycho Bickerstaff2013-12-202-4/+4
|\
| * Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft2013-12-202-4/+4
* | added blocks and blockentitiesTycho Bickerstaff2013-12-191-0/+11
|/
* Fixed multiple inheritance in ToLua++.madmaxoft2013-12-165-20/+20
* Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-081-1/+1
|\
| * Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-081-1/+1
* | Added basic ender chestsTiger Wang2013-12-073-10/+201
* | Fixed pickups spawning for BlockEntitiesTiger Wang2013-12-061-1/+1
|/
* Moved json includes to where they are really needed.madmaxoft2013-11-281-0/+1
* Fixed VC2008 compilation, normalized include paths.madmaxoft2013-11-275-5/+5
* Fixed the remaining derpsAlexander Harkness2013-11-275-5/+5
* Further attempts to fix compileTiger Wang2013-11-255-5/+5
* Attempt to fix compilationTiger Wang2013-11-245-5/+5
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-0/+5
* Moved source to srcAlexander Harkness2013-11-2421-0/+3033