 Mattes D
|
84cb258ec2
|
Merge pull request #1414 from Masy98/Crafting
Fixed sign recipe
|
2014-09-10 20:38:22 +02:00 |
|
 Masy98
|
67d710429f
|
Fixed spacing
|
2014-09-10 20:36:51 +02:00 |
|
|
Masy98
|
d8c381d8cc
|
Fixed sign recipe
|
2014-09-10 20:31:33 +02:00 |
|
|
Mattes D
|
c5cd75fae8
|
Exported cClientHandle:GetIPString() to Lua API.
|
2014-09-07 22:35:22 +02:00 |
|
|
Mattes D
|
690867c89e
|
Fixed submodules' downgrade from the previous PR merge.
|
2014-09-07 09:09:10 +02:00 |
|
|
Masy98
|
a2452ff6fa
|
Re-ordered the items.ini and added a few new names
|
2014-09-06 22:37:48 +02:00 |
|
|
Masy98
|
9cdb9b6262
|
Merge branch 'master' into blocks
Conflicts:
MCServer/crafting.txt
|
2014-09-06 22:06:40 +02:00 |
|
|
Masy98
|
029eb3d4fa
|
Merge remote-tracking branch 'upstream/master'
|
2014-09-06 22:03:35 +02:00 |
|
 Alexander Harkness
|
f6e029253f
|
Removed outdated message sending methods.
Fixes #1381
|
2014-09-06 10:24:33 +01:00 |
|
|
Mattes D
|
b1cc1451d4
|
Merge pull request #1361 from mc-server/WebAdmin
Webadmin improvements
|
2014-09-06 11:12:18 +02:00 |
|
|
Masy98
|
15bee41a36
|
Merge remote-tracking branch 'upstream/master'
|
2014-09-05 11:27:21 +02:00 |
|
|
madmaxoft
|
1b9edb0279
|
Debuggers: Reviewed and fixed the Pickups and Poof commands.
Now they're confirmed working.
|
2014-09-03 23:05:49 +02:00 |
|
|
madmaxoft
|
5fa1a7fa22
|
Debuggers: Added a test code for ForEachEntityInBox().
Currently untested, may not run, may crash.
|
2014-09-03 17:02:16 +02:00 |
|
|
madmaxoft
|
a9ed5baba3
|
Exported ForEachEntityInBox() to Lua API.
|
2014-09-03 17:01:23 +02:00 |
|
|
Masy98
|
4823cbf73d
|
Fixed typo!
|
2014-09-02 21:54:47 +02:00 |
|
|
Masy98
|
63e9c9c6d9
|
Added missing recipes!
|
2014-09-02 21:36:59 +02:00 |
|
|
Masy98
|
20678ec542
|
Seperated the "custom" names from the normal list!
|
2014-09-02 21:36:32 +02:00 |
|
|
Masy98
|
96f5b3c465
|
Added new recipes!
|
2014-09-02 21:09:32 +02:00 |
|
|
Masy98
|
cdec89d924
|
Seperated "custom" names list from the normal list in items.ini!
|
2014-09-02 21:00:26 +02:00 |
|
 Howaner
|
c19b2befa8
|
Changed the IsEnchantable() comment again.
|
2014-09-02 20:17:31 +02:00 |
|
|
Howaner
|
e431bb4e63
|
Merge branch 'master' into Inventory
|
2014-09-02 20:11:38 +02:00 |
|
|
Howaner
|
b8769e3fb4
|
Merge branch 'master' into WebAdmin
|
2014-09-02 19:37:03 +02:00 |
|
|
madmaxoft
|
4837d41368
|
Re-added alternate spellings of darkgraywool.
|
2014-09-02 08:35:58 +02:00 |
|
|
madmaxoft
|
7fb9cbcfb2
|
Re-updated the Core.
|
2014-09-02 08:34:23 +02:00 |
|
|
Masy98
|
8f58cc50dd
|
Added missing leather recipe!
|
2014-09-01 21:34:04 +02:00 |
|
|
Masy98
|
cc9acd13b9
|
Merge branch 'master' into blocks
Conflicts:
MCServer/furnace.txt
MCServer/items.ini
|
2014-09-01 21:30:45 +02:00 |
|
|
Masy98
|
9674224e32
|
Fixed spacing and light gray wool name!
|
2014-09-01 19:08:29 +02:00 |
|
|
Mattes D
|
78b7d0006a
|
Merge pull request #1363 from mc-server/FurnaceRecipes
Rewritten furnace.txt loading
|
2014-09-01 09:00:51 +02:00 |
|
|
Howaner
|
959f89f5bc
|
Fixed ReplaceString() documentation.
|
2014-09-01 00:42:40 +02:00 |
|
|
Howaner
|
3d7b8d3598
|
Rewrited furnace.txt
|
2014-08-31 19:28:36 +02:00 |
|
|
Masy98
|
90d39fd917
|
Added furnace recipes!
|
2014-08-31 16:50:05 +02:00 |
|
|
Masy98
|
ec259eeef0
|
Added missing mossy stonebrick recipe!
|
2014-08-31 16:33:19 +02:00 |
|
|
Masy98
|
b13f10aabf
|
Added 1.8 recipes!
|
2014-08-31 16:25:12 +02:00 |
|
|
Masy98
|
9ee5229833
|
Added 1.8 blocks and items!
|
2014-08-31 15:28:01 +02:00 |
|
|
Howaner
|
1ec8c12799
|
WebAdmin: Exported logo and background.
|
2014-08-31 15:25:40 +02:00 |
|
|
Howaner
|
ceb1a46449
|
WebAdmin: Added favicon to the login template.
|
2014-08-31 14:52:44 +02:00 |
|
|
Howaner
|
fca986ec71
|
WebAdmin: Exported favicon.
|
2014-08-31 14:51:07 +02:00 |
|
|
Howaner
|
9a95b00648
|
WebAdmin: Exported stylesheet in a own file.
|
2014-08-31 14:39:58 +02:00 |
|
|
Howaner
|
8934ab487e
|
WebAdmin: Added login template
|
2014-08-31 14:20:42 +02:00 |
|
|
madmaxoft
|
26b8471280
|
Merge branch 'master' into fixes
|
2014-08-30 22:17:49 +02:00 |
|
|
Masy98
|
55907376d5
|
Fixed missing slab name in line 297
|
2014-08-30 21:36:20 +02:00 |
|
|
Masy98
|
2d5a38bd61
|
Merge branch 'master' into crafting
|
2014-08-30 21:31:51 +02:00 |
|
|
Howaner
|
3ee3a59e75
|
Changed the IsEnchantable() comment.
|
2014-08-30 15:06:43 +02:00 |
|
 Tiger Wang
|
9c1fadd50c
|
Updated Core
|
2014-08-29 15:13:47 +01:00 |
|
|
Hownaer
|
c4d7f7996b
|
Hotfixed recipe.txt loading.
|
2014-08-29 00:42:33 +02:00 |
|
|
Hownaer
|
4ff34b9f10
|
APIDump: Added missing cItem things.
|
2014-08-28 18:18:21 +02:00 |
|
|
Hownaer
|
e555cb4ab3
|
Fixed ItemCategory code example.
|
2014-08-28 00:05:11 +02:00 |
|
|
Mattes D
|
fe3d8fd810
|
Debuggers: Added a testcase for OnProjectileHitBlock.
This is a test for #1326.
|
2014-08-27 15:41:29 +03:00 |
|
|
Mattes D
|
98974412fa
|
Merge remote-tracking branch 'origin/master' into DungeonRoomsFinisher
|
2014-08-26 17:09:16 +03:00 |
|
|
Mattes D
|
3a60f2cd83
|
Profiling: Added profiling script for x64 executable.
|
2014-08-26 16:55:43 +03:00 |
|