 WayofTime
|
1bb699cb9a
|
Merge pull request #551 from grundyboy34/patch-1
Updated RitualEffectGrowth to support non-standard farms
|
2016-01-08 07:30:13 -05:00 |
|
|
WayofTime
|
789b3c2afb
|
Merge pull request #523 from ljfa-ag/patch-1
Fix #347 again...
|
2015-12-31 11:36:08 -05:00 |
|
|
WayofTime
|
2a4e53714a
|
Merge pull request #482 from TehNut/master
Fix crashing with BiblioWoods Forestry
|
2015-10-26 20:47:32 -04:00 |
|
|
WayofTime
|
0764dd7be8
|
Merge pull request #473 from TehNut/patch-1
Fix potential issue with reloading configs
|
2015-10-18 06:57:49 -04:00 |
|
|
WayofTime
|
6b15fb823f
|
Merge pull request #468 from TehNut/master
A few command related things
|
2015-10-12 16:46:05 -04:00 |
|
|
WayofTime
|
0cb0239276
|
Merge pull request #467 from Arcaratus/master
ALL THE LP CONFIGS
|
2015-10-10 15:49:47 -04:00 |
|
|
WayofTime
|
0f7e2ba813
|
Merge pull request #466 from TehNut/master
Knocking out the Todo list
|
2015-10-09 20:29:35 -04:00 |
|
|
WayofTime
|
d259783ead
|
Merge pull request #465 from Necr0/patch-1
Fix Invisible Items
|
2015-10-09 08:37:22 -04:00 |
|
|
WayofTime
|
9fb1f61a6a
|
Merge pull request #464 from TehNut/master
Various fixes and improvements (Details in description)
|
2015-10-07 18:55:51 -04:00 |
|
|
WayofTime
|
47849d4ab2
|
Merge pull request #463 from UndeadZeratul/Fix-Harvest-Levels
Allow Bound Tool Harvest Levels to be Altered
|
2015-10-06 21:27:45 -04:00 |
|
|
WayofTime
|
b2985550dc
|
Merge pull request #449 from iambob314/patch-1
Added more biome control in BiomeChanger ritual
|
2015-10-04 18:42:18 -04:00 |
|
|
WayofTime
|
277cd0742e
|
Merge pull request #454 from Arcaratus/master
Created package-info file
|
2015-09-19 15:09:32 -04:00 |
|
|
WayofTime
|
f0e4d0feab
|
Merge pull request #435 from Arcaratus/master
Fix TEBelljar and #433
|
2015-08-27 13:07:06 -04:00 |
|
|
WayofTime
|
02c613d608
|
Merge pull request #423 from Arcaratus/master
Vacation commit
|
2015-08-12 08:35:11 -04:00 |
|
|
WayofTime
|
91ad8debe2
|
Merge pull request #412 from Arcaratus/bloodmagic1.8
Finished all porting
|
2015-07-31 11:42:07 -04:00 |
|
|
WayofTime
|
b5d9e3ee58
|
Merge pull request #410 from Arcaratus/bloodmagic1.8
All items !sigils
|
2015-07-30 20:49:27 -04:00 |
|
|
WayofTime
|
8fcbc53983
|
Merge pull request #409 from Arcaratus/bloodmagic1.8
Finished (almost) everything !items
|
2015-07-30 16:32:51 -04:00 |
|
|
WayofTime
|
8eed901fcb
|
Merge pull request #408 from Arcaratus/bloodmagic1.8
Finished TileEntities
|
2015-07-30 11:00:44 -04:00 |
|
|
WayofTime
|
cd5a52c7fb
|
Merge pull request #406 from Arcaratus/bloodmagic1.8
Add BlockRender code
|
2015-07-29 14:47:12 -04:00 |
|
|
WayofTime
|
ffd5a672cb
|
Merge pull request #405 from Arcaratus/bloodmagic1.8
Finished all Blocks
|
2015-07-29 14:38:47 -04:00 |
|
|
WayofTime
|
1fbebc56a2
|
Merge pull request #404 from Arcaratus/bloodmagic1.8
Did ModBlocks
|
2015-07-29 11:34:46 -04:00 |
|
|
WayofTime
|
14d603e99c
|
Merge pull request #403 from Arcaratus/bloodmagic1.8
I hope this works
|
2015-07-29 09:32:44 -04:00 |
|
|
WayofTime
|
f85a9471dd
|
Merge pull request #402 from Arcaratus/master
Performance Commit 2
|
2015-07-28 14:18:47 -04:00 |
|
|
WayofTime
|
647f81e624
|
Merge pull request #399 from Arcaratus/master
Added in #396 and sword blocking
|
2015-07-27 14:07:22 -04:00 |
|
|
WayofTime
|
87d8af95d7
|
Merge pull request #393 from Arcaratus/master
Fix Entities
|
2015-07-20 19:57:47 -04:00 |
|
|
WayofTime
|
43c1386c78
|
Merge pull request #391 from qianzha/patch-10
Update zh_CN.lang (v1.3.3-4)
|
2015-07-19 16:17:58 -04:00 |
|
|
WayofTime
|
07973fb674
|
Merge pull request #390 from Arcaratus/master
Fixed Elemental Crash
|
2015-07-18 10:18:02 -04:00 |
|
|
WayofTime
|
1ca7795164
|
Merge pull request #387 from Arcaratus/master
Refixed the Dismantler
|
2015-07-16 09:48:08 -04:00 |
|
|
WayofTime
|
77ae114b02
|
Merge pull request #386 from Arcaratus/master
Fixed Ritual Dismantler
|
2015-07-16 09:31:56 -04:00 |
|
|
WayofTime
|
6bdcfc4f46
|
Merge pull request #384 from Arcaratus/master
Add achievements
|
2015-07-13 15:04:33 -04:00 |
|
|
WayofTime
|
976df4e0e5
|
Merge pull request #382 from Arcaratus/master
Fix #381
|
2015-07-10 16:55:16 -04:00 |
|
|
WayofTime
|
8632aeb253
|
Merge pull request #379 from Arcaratus/master
Fix #373 and did #375
|
2015-07-09 11:30:50 -04:00 |
|
|
WayofTime
|
723a8b4a7e
|
Merge pull request #314 from Adaptivity/master
Make some messages localized serverside
|
2015-07-07 14:24:17 -04:00 |
|
|
WayofTime
|
1280f4e0ae
|
Merge pull request #372 from Arcaratus/master
Fix #370, #367
|
2015-07-06 18:55:55 -04:00 |
|
|
WayofTime
|
b75c0f5852
|
Merge pull request #369 from Arcaratus/master
Performance Commit
|
2015-07-02 11:19:37 -04:00 |
|
|
WayofTime
|
013367cffa
|
Merge pull request #354 from Arcaratus/master
Things
|
2015-06-22 14:15:46 -04:00 |
|
|
WayofTime
|
234ba2bc1d
|
Merge pull request #362 from Samernieve/patch-1
Update es_ES.lang
|
2015-06-21 13:27:11 -04:00 |
|
|
WayofTime
|
9686c6f8b5
|
Merge pull request #359 from ljfa-ag/magnetism
Cache values of isBlockOre for Ritual of Magnetism
|
2015-06-21 13:26:57 -04:00 |
|
|
WayofTime
|
ff8cf59bb8
|
Merge pull request #351 from Arcaratus/master
Added useful things
|
2015-06-13 18:03:49 -04:00 |
|
|
WayofTime
|
6ef59dcb27
|
Merge pull request #348 from ljfa-ag/magnetism
Change ore block detection for Ritual of Magnetism
|
2015-06-10 16:00:00 -04:00 |
|
|
WayofTime
|
e9519662ba
|
Merge pull request #346 from NatsuArashi/patch-2
Update zh_TW.lang
|
2015-06-10 15:54:41 -04:00 |
|
|
WayofTime
|
96a5d93649
|
Merge pull request #331 from Arcaratus/master
Sigil of Holding remake!
|
2015-05-18 20:32:19 -04:00 |
|
|
WayofTime
|
4470eb3178
|
Merge pull request #328 from Arcaratus/master
Updated things, added in Unbinding recipes, etc.
|
2015-05-11 21:46:03 -04:00 |
|
|
WayofTime
|
940c9e8219
|
Merge pull request #327 from Arcaratus/master
Fixed teleposers
|
2015-05-11 19:10:11 -04:00 |
|
|
WayofTime
|
69aeb4a813
|
Merge pull request #319 from TehNut/master
Remove non-essential files from `../gradle/`
|
2015-05-06 07:14:17 -04:00 |
|
|
WayofTime
|
201c70a766
|
Merge pull request #308 from Arcaratus/master
Updated things
|
2015-04-19 22:27:21 -04:00 |
|
|
WayofTime
|
6f182805aa
|
Merge pull request #306 from Arcaratus/master
Added things
|
2015-04-19 12:40:27 -04:00 |
|
|
WayofTime
|
d423ea5807
|
Merge pull request #304 from MrKunji/patch-3
Update en_US.lang
|
2015-04-18 17:11:44 -04:00 |
|
|
WayofTime
|
e99f545694
|
Merge pull request #302 from ljfa-ag/phantom-bridge
Fix phantom bridge blocks being one block too high on the client
|
2015-04-18 17:11:29 -04:00 |
|
|
WayofTime
|
d1fc806113
|
Merge pull request #190 from AegisLesha/patch-3
Update fr_FR.lang
|
2015-04-14 12:35:08 -04:00 |
|
|
WayofTime
|
afa3988a21
|
Merge pull request #299 from ljfa-ag/bound-pick
Make item dropping from bound tools more efficient
|
2015-04-10 19:46:58 -04:00 |
|
|
WayofTime
|
4d57cff61c
|
Merge pull request #297 from MrKunji/patch-1
Update en_US.lang
|
2015-04-10 14:51:21 -04:00 |
|
|
WayofTime
|
003a65a51b
|
Merge pull request #298 from Arcaratus/master
Converted all TEAltar to IBloodAltar
|
2015-04-10 11:02:00 -04:00 |
|
|
WayofTime
|
833858d064
|
Merge pull request #269 from ljfa-ag/master
Extracted base class for all tile entities with inventory
|
2015-04-09 18:10:09 -04:00 |
|
|
WayofTime
|
e41251f43a
|
Merge pull request #283 from Arcaratus/master
Fixed my little dagger derp
|
2015-03-23 22:13:49 -04:00 |
|
|
WayofTime
|
01be2abffd
|
Merge pull request #272 from MaPePeR/WhirlwindAngleFiltering
Only reflect Projectiles that fly in the direction of the player
|
2015-03-19 15:25:07 -04:00 |
|
|
WayofTime
|
660c1f66bd
|
Merge pull request #264 from Vazkii/patch-2
Better fake player checking.
|
2015-02-27 18:33:01 -05:00 |
|
|
WayofTime
|
5fdad1dc0d
|
Merge pull request #263 from hilburn/master
Dagger of sacrifice cleanup
|
2015-02-27 16:38:29 -05:00 |
|
|
WayofTime
|
2f47ffa955
|
Merge pull request #262 from hilburn/master
Fixes API
|
2015-02-25 06:11:42 -05:00 |
|
|
WayofTime
|
5bcf253659
|
Merge pull request #260 from TehNut/patch-3
Fix teleposerBlacklist shorthand support
|
2015-02-20 18:10:16 -05:00 |
|
|
WayofTime
|
df776f0323
|
Merge pull request #259 from TehNut/master
Add teleposer blacklist + Remove server files from repo
|
2015-02-20 16:52:07 -05:00 |
|
|
WayofTime
|
72312f2cdf
|
Merge pull request #258 from hilburn/master
Fixes Harvest Level of Deactivated Items
|
2015-02-18 14:59:41 -05:00 |
|
|
WayofTime
|
18fdcdac1c
|
Merge pull request #250 from hilburn/master
Blacklist Tile Accelerators
|
2015-02-13 11:29:56 -05:00 |
|
|
WayofTime
|
6c501c10c0
|
Merge pull request #249 from hilburn/diviner_changes
Diviner Changes
|
2015-02-13 11:29:47 -05:00 |
|
|
WayofTime
|
246b654e03
|
Merge pull request #254 from hilburn/soul-fray-fix
Prevents removal of Soul Fray with milk
|
2015-02-13 11:29:29 -05:00 |
|
|
WayofTime
|
cf183a46ca
|
Merge pull request #244 from hilburn/master
Should prevent Powered/Auto Spawners spawning demons
|
2015-02-05 19:09:02 -05:00 |
|
|
WayofTime
|
e47e41fda9
|
Merge pull request #237 from hilburn/master
Changes to Item Binding
|
2015-02-02 19:07:43 -05:00 |
|
|
WayofTime
|
fd0ba44834
|
Merge pull request #243 from Arcaratus/master
Added Achievements
|
2015-02-02 18:55:27 -05:00 |
|
|
WayofTime
|
25c8d238dd
|
Merge pull request #242 from Vazkii/patch-1
Account for Use Golems in the fake player check
|
2015-02-02 14:03:20 -05:00 |
|
|
WayofTime
|
9e0e90d6e2
|
Merge pull request #239 from hilburn/mt-fix
Shapeless Blood Orb Recipe fix
|
2015-02-01 10:41:16 -05:00 |
|
|
WayofTime
|
c6ba742d5f
|
Merge pull request #238 from hilburn/mt-fix
Blood Orb MT fix
|
2015-02-01 07:29:39 -05:00 |
|
|
WayofTime
|
4880e0cae7
|
Merge pull request #236 from benblank/diviner-interface
Allow other mods to recognize the Ritual Diviner using the API
|
2015-02-01 07:29:08 -05:00 |
|
|
WayofTime
|
885d1a41de
|
Merge pull request #232 from hilburn/master
MineTweaker additions
|
2015-01-31 11:48:03 -05:00 |
|
|
WayofTime
|
82b1663651
|
Merge pull request #235 from chbachman/patch-2
Remove calls to SpellHelper, redirect to APISpellHelper
|
2015-01-31 11:47:07 -05:00 |
|
|
WayofTime
|
f62c1a9a0e
|
Merge pull request #231 from ReikaKalseki/patch-1
Update TeleposeEvent.java
|
2015-01-26 09:00:01 -05:00 |
|
|
WayofTime
|
5b4d4ff498
|
Merge pull request #223 from Adaptivity/sorting
Sorted new strings
|
2015-01-25 07:09:53 -05:00 |
|
|
WayofTime
|
e15c52d48f
|
Merge pull request #229 from Sciencei/master
Expanded plants that Sigil of Growth/Ritual of the Green Grove work with
|
2015-01-25 07:09:46 -05:00 |
|
|
WayofTime
|
838df4ca06
|
Merge pull request #228 from ReikaKalseki/master
Add Teleposer Event
|
2015-01-25 07:07:47 -05:00 |
|
|
WayofTime
|
d01093a441
|
Merge pull request #220 from Adaptivity/morelocalization
Long-awaited feature(Localized messages and more)
|
2015-01-23 07:56:05 -05:00 |
|
|
WayofTime
|
beab450a62
|
Merge pull request #194 from Arcaratus/master
Added SN commands
|
2015-01-03 11:13:44 -05:00 |
|
|
WayofTime
|
dd2041ea54
|
Merge pull request #186 from Cisien/patch-1
fix addToDemonBloodDuration
|
2014-12-29 06:48:26 -05:00 |
|
|
WayofTime
|
ef82b68a16
|
Merge pull request #176 from Arcaratus/master
Added Binding Rituals for NEI
|
2014-12-13 16:00:15 -05:00 |
|
|
WayofTime
|
dd4c36b39c
|
Merge pull request #174 from TehNut/master
Update README and add LICENSE to repo
|
2014-12-06 18:22:28 -05:00 |
|
|
WayofTime
|
b661d72f88
|
Merge pull request #163 from ganymedes01/patch-1
Stop pipes/etc from inserting items into the output slot
|
2014-11-24 17:21:56 -05:00 |
|
|
WayofTime
|
00f84744ee
|
Merge pull request #162 from qianzha/patch-9
Update zh_TW.lang(v1.2.1a)
|
2014-11-24 17:21:42 -05:00 |
|
|
WayofTime
|
c48af7f578
|
Merge pull request #161 from qianzha/patch-8
Update zh_CN.lang(v1.2.1a)
|
2014-11-24 17:21:38 -05:00 |
|
|
WayofTime
|
b16ffd8037
|
Merge pull request #164 from Tombenpotter/master
Fixed the Teleporting methods C:
|
2014-11-24 17:21:24 -05:00 |
|
|
WayofTime
|
f138a8347e
|
Merge pull request #160 from Alex-hawks/master
Change Rituals to allow for TileEntity Runes, and Hybrid Runes
|
2014-11-22 10:00:23 -05:00 |
|
|
WayofTime
|
d23d90918d
|
Merge pull request #157 from ganymedes01/master
Changed the life essence/blood textures so they look more like blood
|
2014-11-14 19:54:36 -05:00 |
|
|
WayofTime
|
66501744f6
|
Merge pull request #156 from ganymedes01/master
Enable lighting when rendering models. Everything looks a lot better!
|
2014-11-13 17:22:10 -05:00 |
|
|
WayofTime
|
69abce8f85
|
Merge pull request #154 from TehNut/patch-1
Remove extra syncConfig()
|
2014-11-11 18:33:06 -05:00 |
|
|
WayofTime
|
dd3a093825
|
Merge pull request #152 from mysticdrew/master
Plinth and Pedestal bounding box fix for servers
|
2014-11-07 09:15:05 -05:00 |
|
|
WayofTime
|
7946a7c226
|
Merge pull request #150 from TehNut/master
Switch to real logger, create ConfigGui, remove random debug thing, add ritual disabling
|
2014-11-03 19:33:00 -05:00 |
|
|
WayofTime
|
e7657f7429
|
Merge pull request #143 from Arcaratus/master
Added a Creative Dagger
|
2014-11-02 11:52:10 -05:00 |
|
|
WayofTime
|
6d9b565c98
|
Merge pull request #142 from TehNut/master
Upgradle + Add Manifest
|
2014-11-02 11:51:30 -05:00 |
|
|
WayofTime
|
207af72c93
|
Merge pull request #139 from Arcaratus/master
Cleaned up base mod file imports :P
|
2014-11-01 08:20:59 -04:00 |
|
|
WayofTime
|
19d050c398
|
Merge pull request #138 from TehNut/master
Update buildscripts, re-add models that went missing, update mcmod.info
|
2014-10-31 20:55:27 -04:00 |
|
|
WayofTime
|
4e9ce6964b
|
Merge pull request #137 from Tombenpotter/master
Added method to teleport entities across dimensions
|
2014-10-31 15:33:36 -04:00 |
|
|
WayofTime
|
e6fdd9f413
|
Merge pull request #126 from Alex-hawks/patch-1
Add overload of syphonAndDamageFromNetwork that takes a String
|
2014-10-31 15:33:09 -04:00 |
|
|
WayofTime
|
6998c43d59
|
Merge pull request #132 from qianzha/patch-7
Update zh_TW.lang(v1.2.0b)
|
2014-10-31 15:31:27 -04:00 |
|