summaryrefslogtreecommitdiffstats
path: root/src/World.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixed players custom name in 1.8Howaner2014-09-261-1/+1
|
* Merge branch 'master' into 1.8-ProtocolHowaner2014-09-191-0/+3
|\
| * Update World.hnesco2014-09-171-1/+1
| |
| * Preparing 1.8 update nesco2014-09-161-0/+3
| | | | | | Added Spectator gamemode
* | Exported player list states to extra functions.Howaner2014-09-181-27/+31
| |
* | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-131-1/+1
|\| | | | | | | | | Conflicts: src/Items/ItemHoe.h
| * Spawn exp if you break a mob spawner.Howaner2014-09-121-1/+1
| |
* | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-121-3/+3
|\|
| * TimeOfDay does not need to be an Int64Tycho2014-09-081-3/+3
| |
* | 1.8: Added ParticleEffect packet.Howaner2014-09-111-1/+1
| |
* | Added the player list to the 1.8 protocol.Howaner2014-09-091-1/+1
|/
* Rewritten chunk status to specify whether the chunk is in queue.Mattes D2014-09-051-7/+7
| | | | This fixes #1370.
* Merge remote-tracking branch 'origin/master' into EntitiesInBoxmadmaxoft2014-09-041-4/+4
|\
| * fix chunk regeneratingLO1ZB2014-08-291-1/+1
| |
| * remove y-coord from chunksLO1ZB2014-08-281-3/+3
| |
* | Added cWorld::ForEachEntityInBox()madmaxoft2014-09-031-0/+5
|/
* CheckBasicStyle checks the src folder as well.madmaxoft2014-08-141-1/+1
|
* Renamed functions.Howaner2014-08-101-4/+4
|
* Renamed m_DoDaylightCycle to m_CycleDaylight.Howaner2014-08-081-4/+4
|
* Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.Howaner2014-08-071-1/+13
| | | I need this for a GameRule plugin.
* Exported the beacon.Howaner2014-07-301-0/+5
|
* Merged branch 'howaner/Options'.madmaxoft2014-07-301-0/+7
|\
| * Add "Broadcasting" settings to world.iniHowaner2014-07-271-1/+7
| |
* | Slight cleanup after portalsTiger Wang2014-07-291-2/+3
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-291-25/+25
|\| | | | | | | | | Conflicts: src/World.h
| * Removed redundant semicolons and re-added warningarchshift2014-07-241-6/+6
| |
| * Added a queue for setting chunk data.madmaxoft2014-07-241-18/+18
| | | | | | | | Fixes #1196.
| * Export BroadcastEntityAnimation with ToLuaarchshift2014-07-221-1/+1
| | | | | | Fixes #752
* | Speed improvements, crash fixes, & self-suggestionsTiger Wang2014-07-221-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-5/+5
|\| | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-211-4/+4
| |
| * Fixed style: spaces after commas.madmaxoft2014-07-191-1/+1
| |
* | SuggestionsTiger Wang2014-07-211-0/+7
| |
* | Bug and crash fixesTiger Wang2014-07-201-1/+1
| | | | | | | | | | | | | | | | | | * Fixes end portals' solidity * Fixed crashes to do with multithreading and removing an entity from the wrong world * Fixed crashes due to bad merge * Fixed crashes due to an object being deleted twice * Simplified cWorld::Start() and added comments to configuration files
* | Fix failed merge and other issuesTiger Wang2014-07-181-12/+0
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-181-29/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp
| * Normalized comments.madmaxoft2014-07-171-1/+1
| | | | | | | | | | This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
| * Fixed spaces around single-line comments.madmaxoft2014-07-171-4/+4
| | | | | | | | There should be at least two spaces in front and one space after //-style comments.
| * Fixed basic whitespace problems.madmaxoft2014-07-171-7/+7
| | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
| * Made CreateProjectile a pointerworktycho2014-07-131-1/+1
| |
| * Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-131-1/+1
| |
| * Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-131-13/+2
| |\ | | | | | | Implemented trapped chests & others
| | * Implemented trapped chests & othersTiger Wang2014-07-071-13/+2
| | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes
| * | Implemented support for forced chunk ticking.madmaxoft2014-07-101-0/+7
| | | | | | | | | | | | Fixes #1160.
| * | Fixed arrow collection animationTiger Wang2014-07-091-1/+0
| |/ | | | | | | * Fixed piston extension non-solidness
| * Redstone simulator is alerted to lever unpoweringTiger Wang2014-07-021-1/+1
| | | | | | | | | | * Fixed the "fix" that broke the fix for #535, thereby fixing said issue * Fixed #535
| * Added generic entity-collecting.Mattes D2014-06-271-0/+1
| | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098.
* | Merge branch 'master' into portalsTiger Wang2014-06-211-1/+2
|\| | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * Nullify deleted pointers.archshift2014-06-191-0/+1
| |
| * Merge branch 'master' into GlobalFixesHowaner2014-06-171-8/+73
| |\
| * | Add DoWithBlockEntityAt() to WorldInterface.hHowaner2014-06-171-1/+1
| | |
* | | Fixed invalid iteratorsTiger Wang2014-06-211-3/+0
| | |
* | | Cauldrons check the heightmapTiger Wang2014-06-141-3/+3
| | |
* | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-141-6/+32
|\ \ \ | | |/ | |/| | | | | | | Conflicts: src/World.h
| * | Removed an unused fwd declaration.madmaxoft2014-06-131-1/+0
| | |
| * | Fixed constnessworktycho2014-06-111-5/+5
| | |
| * | Compile fixTiger Wang2014-06-111-1/+1
| | |
| * | Reduced code duplicationTiger Wang2014-06-111-4/+4
| | | | | | | | | | | | | | | | | | call @maxmaxoft! calling... call connected (0:20) call ended
| * | IsWeatherSunnyAt does something useful :DTiger Wang2014-06-111-9/+5
| | |
| * | SMICOLOSLAlexander Harkness2014-06-111-4/+4
| | | | | | | | | Meant to be semicolons up there.
| * | Updated unnecessary function :/Tiger Wang2014-06-111-1/+5
| | |
| * | Add DoxyComments to he weather things. Alexander Harkness2014-06-111-7/+24
| | | | | | | | | Also changed the function names.
| * | Add new IsWeatherWet hook for cauldrons.Alexander Harkness2014-06-111-1/+12
| | | | | | | | | @madmaxoft can you comment?
* | | Merge branch 'master' into portalsTiger Wang2014-06-101-3/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp
| * | Fixed deadlock when moving players to other worlds.Mattes D2014-06-081-2/+19
| | | | | | | | | | | | Fixes #1039, fixes #851
| * | Added queue for adding entities to cWorld.Mattes D2014-06-081-1/+8
| | | | | | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed.
* | | Portal improvements and suggestionsTiger Wang2014-06-101-2/+11
| | |
* | | SuggestionsTiger Wang2014-06-051-1/+3
| | |
* | | Configurable portalsTiger Wang2014-06-041-0/+24
| | |
* | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-041-1/+15
|\| |
| * | Changed block send queue to use vectorsTiger Wang2014-05-291-4/+2
| | | | | | | | | | | | As suggested by @worktycho.
| * | Hopefully fixed piston duplication issuesTiger Wang2014-05-251-1/+17
| |/ | | | | | | | | * Fixes #879 * Fixes #714
* / Cauldrons fillTiger Wang2014-05-291-2/+2
|/
* Merge branch 'master' into fixesTiger Wang2014-05-061-1/+1
|\ | | | | | | | | Conflicts: src/Vector3.h
| * Redstone simulator now directly accesses cChunkTiger Wang2014-04-271-1/+1
| | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes
* | Merge branch 'master' into fixes.madmaxoft2014-05-021-1/+4
|\|
| * Moved the weather picker out of TickWeather(), squashing a warning and improving readability.archshift2014-04-261-1/+4
| |
* | Merge branch 'master' into fixesTiger Wang2014-04-241-1/+1
|\| | | | | | | | | Conflicts: src/World.h
| * Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-181-1/+1
| |
* | Small changesTiger Wang2014-04-231-1/+3
|/
* Merge branch 'master' into overrideTycho2014-04-051-13/+13
|\ | | | | | | | | Conflicts: lib/tolua++/CMakeLists.txt
| * Fixed a few clang warnings.madmaxoft2014-03-301-3/+3
| |
| * Minor fixesandrew2014-03-251-10/+10
| |
| * Wither invulnerabilityandrew2014-03-241-1/+1
| |
* | Added override specifier to functions declared in cWorldTycho2014-03-221-8/+8
|/
* ENUMified shrapnel levelTiger Wang2014-03-201-6/+4
|
* Merge branch 'master' into awesometntTiger Wang2014-03-181-39/+39
|\ | | | | | | | | Conflicts: src/ChunkMap.cpp
| * Added override specifier where appropriate in cWorld.madmaxoft2014-03-161-37/+38
| |
| * Merge pull request #782 from mc-server/bedsMattes D2014-03-161-4/+4
| |\ | | | | | | Beds now work properly, fixes #707
| | * Beds now work properly fixes #707Tiger Wang2014-03-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Also fixes FS392 Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp
| * | Unified Vector classesandrew2014-03-111-2/+1
| | |
* | | Added levels of shrapnelTiger Wang2014-03-181-4/+8
| | |
* | | Merge remote-tracking branch 'origin/master' into awesometntTiger Wang2014-03-101-2/+2
|\| | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp
| * | Merge pull request #768 from Howaner/BlockEntitysTiger Wang2014-03-091-1/+1
| |\ \ | | | | | | | | Add TNT load/save
| | * | Merge branch 'master' into BlockEntitysHowaner2014-03-081-1/+1
| | |\|
| | * | Change TNT Fuse to ticksHowaner2014-03-081-1/+1
| | | |
| * | | Merge branch 'master' into ballisticmissilesTiger Wang2014-03-091-5/+20
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/ClientHandle.cpp
| * | | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-271-1/+1
| | | | | | | | | | | | | | | | + Added fireworks
* | | | Merge branch 'master' into awesometntTiger Wang2014-03-101-5/+20
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #763 from Howaner/BlockEntitysMattes D2014-03-071-4/+9
| |\ \ \ | | | |/ | | |/| Add Flower Pots
| | * | Add Lua Bindings for FlowerPotEntity.h and add documentation.Howaner2014-03-071-2/+2
| | | |
| | * | Add Flower PotsHowaner2014-03-071-2/+7
| | | |
| * | | Add SendBlockTo to cWorldInterfaceHowaner2014-03-051-1/+1
| |/ /
| * | Fixed previous weather changes.madmaxoft2014-03-031-1/+2
| | | | | | | | | | | | cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather.
| * | Add cancelling to WeatherChanging event.Howaner2014-03-021-0/+3
| | |
| * | More documentation (thanks to madmaxoft) and use GetBlockTypeMetaHowaner2014-03-021-2/+2
| | |
| * | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone BugsHowaner2014-03-021-0/+6
| |/
* / Shrapnel now configurableTiger Wang2014-03-101-0/+6
|/
* Maps: Improvementsandrew2014-02-231-3/+6
|
* Thread safe cMap managerandrew2014-02-201-2/+3
|
* Manual merge (Fixed conflicts)andrew2014-02-201-32/+56
|\
| * Merge pull request #697 from Howaner/SkullMattes D2014-02-191-0/+5
| |\ | | | | | | Add Skulls/Heads to MCServer
| | * Rename SkullEntity to MobHeadEntityHowaner2014-02-191-4/+4
| | |
| | * Add Heads completelyHowaner2014-02-181-0/+5
| | |
| * | The cuboid for cWorld::SetAreaBiome() doesn't need sorting.madmaxoft2014-02-181-1/+2
| | |
| * | Added cWorld:SetAreaBiome() API function.madmaxoft2014-02-181-1/+19
| | | | | | | | | | | | Fixes #675.
| * | Added a bit more documentation to cForEachChunkProvider.madmaxoft2014-02-181-4/+7
| |/
| * Removed the unnecessary LoopPlayersAndBroadcastChat() functions.madmaxoft2014-02-151-9/+7
| |
| * Implemented cCompositeChat.madmaxoft2014-02-151-1/+3
| | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678.
| * Merge pull request #677 from mc-server/BroadcastParticleEffectAlexander Harkness2014-02-151-1/+1
| |\ | | | | | | Broadcast particle effect
| | * Exported cWorld::BroadcastParticleEffect.STRWarrior2014-02-151-1/+1
| | |
| * | Merged branch 'narroo/master'.madmaxoft2014-02-131-1/+14
| |\ \ | | |/ | |/| | | | This merges pull request #661.
| | * Fixed formatting. Moved UnloadUnusedChunks from public to private.narroo2014-02-111-4/+3
| | |
| | * Fixed formatting of previous commit.narroo2014-02-111-2/+2
| | |
| | * Fixed bug #385. UnloadUnusedChunks now has the same interface asnarroo2014-02-111-1/+15
| | | | | | | | | | | | | | | | | | SaveAllChunks. Meaning, QueueUnloadUnusedChunks and the supporting cTaskUnloadUnusedChunks has been added. Use QueueUnloadUnusedChunks from now on to prevent deadlocking.
* | | Send map when selectedandrew2014-02-141-0/+6
| | |
* | | IDCount Serializationandrew2014-02-131-0/+11
|/ /
* | More gcc warnings fixed.madmaxoft2014-02-111-1/+2
| |
* | Merge remote-tracking branch 'origin/master' into ChunkStaymadmaxoft2014-02-091-3/+20
|\|
| * Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-091-0/+3
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp
| * \ Merge branch 'master' into playerimprovementsTiger Wang2014-02-091-2/+2
| |\ \ | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| * | | Improved chat messaging functionsTiger Wang2014-02-071-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API.
| * | | Added more chat functionsTiger Wang2014-02-061-1/+11
| | | |
* | | | Initial ChunkStay code.madmaxoft2014-02-081-3/+0
| |_|/ |/| |
* | | Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later).STRWarrior2014-02-071-4/+4
| | |
* | | Implemented an easy way of adding new redstone simulators.STRWarrior2014-02-071-3/+6
| |/ |/| | | | | Also added a "noop" redstone simulator that does the same as the fluid version.
* | Merge pull request #635 from tonibm19/masterMattes D2014-02-041-1/+1
|\ \ | | | | | | Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API
| * | Not exporting FindClosestPlayertonibm192014-02-031-1/+1
| | |
| * | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua APItonibm192014-02-031-1/+1
| |/
* / Increased Type safety of BiomesTycho2014-02-031-1/+1
|/ | | | | Changed a number of funcictions from using integers to store biomes to using EMCSBiome Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
* Changed pointers to referencesTycho2014-02-011-2/+2
|
* Merge branch 'master' into GeneratingBenchmark2Tycho2014-02-011-0/+3
|\ | | | | | | | | Conflicts: src/World.h
| * The world can now be configured wether farmers should be able to harvest crops.STRWarrior2014-01-271-0/+3
| |
* | Changed signitures of Several BLockHandler MethodsTycho2014-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check
* | Merge branch 'master' into GeneratingBenchmark2Tycho2014-01-261-1/+11
|\| | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h
| * Merge pull request #575 from worktycho/GeneratingBenchmarkMattes D2014-01-251-3/+4
| |\ | | | | | | More Interfaces to decouple Generator from the rest of the code
| * | Mob bugfixesTiger Wang2014-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Mobs no longer require constant line-of-sight to a player to remain aggravated * Fixed an ASSERT * Fixed mobs jumping * Fixed Idle state not properly using AI + Added FILE_IO_PREFIX to favicon loading + Implemented #563
| * | Command block fixes 2andrew2014-01-231-0/+9
| | |
* | | Refactored cBlockHandler::OnUse and dependentsTycho2014-01-261-28/+28
| | |
* | | First attempt at Implementing InterfacesTycho2014-01-251-4/+5
| |/ |/|
* | Merge branch 'master' into GeneratingBenchmarkTycho2014-01-221-3/+12
|\| | | | | | | | | Conflicts: src/World.h
| * Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-211-130/+146
| |\
| * | Scoreboard protocol supportandrew2014-01-211-1/+4
| | |
| * | Basic scoreboard implementationandrew2014-01-191-0/+6
| | |
* | | Actually implemented interfacesTycho2014-01-201-0/+1
| | |
* | | Merge branch 'ForEachChunkProvider' into GeneratingBenchmarkTycho2014-01-201-6/+6
|\ \ \ | |_|/ |/| | | | | | | | Conflicts: src/World.h
| * | Seperated BlockArea From WorldTycho2014-01-201-3/+3
| | | | | | | | | | | | If anyone can come up with a better name for the interface I'll change it, It contians to methods which do compleatly unrelated things
* | | Changed the cWorld::ScheduleTask() signature.madmaxoft2014-01-191-130/+146
| |/ |/| | | | | Now it takes the delay in ticks as an argument, and a cTask descendant as the task to run. Lua API has been updated similarly.
* | Command blocks: Execute()andrew2014-01-181-1/+1
| |
* | Basic command block implementationandrew2014-01-181-6/+10
|/
* Added user setting compression factorTycho2014-01-171-0/+2
|
* Merge pull request #534 from mc-server/SpawnMinecartMattes D2014-01-171-0/+3
|\ | | | | Added cWorld::SpawnMinecart.
| * Renamed cEmptyMinecart to cRideableMinecartSTRWarrior2014-01-121-1/+1
| |
| * EmptyMinecarts should be able to get a block inside of them.STRWarrior2014-01-121-1/+1
| |
| * Added cWorld::SpawnMinecart.STRWarrior2014-01-121-0/+3
| |
* | added cWorld::ScheduleTask FunctionTycho2014-01-141-0/+24
|/ | | | | ScheduleTask schedules a SceduledTask object to be run x ticks in the future. In is exported to lua, fixes #150
* Decoupled cChunkGenerator from cWorld and cRoot.madmaxoft2014-01-101-0/+24
| | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
* Exported cWorld::BroadcastBlockAction().madmaxoft2014-01-061-1/+1
| | | | As requested in #508; no guarantees about it.
* fixed warnings in World.cppTycho Bickerstaff2013-12-311-0/+1
|
* Replaced esCreeper with esMonster.madmaxoft2013-12-231-1/+1
| | | | Any monster will be able to explode, and also this fixes #425.
* Implented BroadcastParticleEffectSTRWarrior2013-12-221-0/+1
|
* Fixed the rest of constructor reorders.madmaxoft2013-12-201-1/+1
|
* Removed some old cRedstone remnantsTiger Wang2013-12-161-5/+0
|
* This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions.STRWarrior2013-12-151-0/+2
|
* Implemented note block playing and fixed wireTiger Wang2013-12-141-0/+5
| | | | Game of Thrones music in Minecraft, here I come!
* Redstone data is now loaded on chunk loadTiger Wang2013-12-131-0/+1
|
* Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-081-0/+3
|\ | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp
| * Added a SpawnFallingBlock function so plugins can make other blocks fall.STRWarrior2013-12-071-0/+3
| |
* | Renamed animation functionTiger Wang2013-12-071-1/+1
| | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* | Fixed duplication glitch with QueueSetBlockTiger Wang2013-12-061-1/+1
|/ | | | | | | If a coordinate was queued, and then the block there was broken, it would reappear: double items! Also now just sets meta if previous and current blocktypes matched.
* Lava can spawn fire.madmaxoft2013-12-041-0/+3
| | | | Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65.
* Added the real tick duration to the OnWorldTick hook.madmaxoft2013-11-301-1/+1
|
* Merged master into redstonefixesTiger Wang2013-11-271-1/+5
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-261-0/+3
| | | | | Conflicts: VC2008/MCServer.vcproj
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-2/+8
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+744
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 18:40:35 +0100