Commit graph

88 commits

Author SHA1 Message Date
Arcaratus
a36c514b63 Fix TEBelljar and #433 2015-08-27 13:02:14 -04:00
WayofTime
1aac4686db Attempt to fix repository 2015-07-31 12:09:09 -04:00
WayofTime
e242207d50 Re-refixed TEBelljar 2015-07-31 11:45:50 -04:00
Arcaratus
d528bdbbf8 Finished all porting 2015-07-31 11:35:05 -04:00
Arcaratus
93e5e6cca6 Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic into bloodmagic1.8 2015-07-30 17:29:08 -04:00
WayofTime
f009d58f74 Fixes 2015-07-30 17:24:46 -04:00
Arcaratus
a2c4f4b965 All the items !sigils 2015-07-30 17:24:20 -04:00
Arcaratus
a9507b3b68 Finished (almost) everything !items 2015-07-30 14:52:39 -04:00
Arcaratus
2472cad9f1 Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic into bloodmagic1.8 2015-07-30 10:24:44 -04:00
Arcaratus
b2f7ec6030 Finished TileEntities 2015-07-30 10:21:53 -04:00
WayofTime
230b44fe88 Finished all errors except for the sigils. 2015-07-30 09:31:16 -04:00
WayofTime
977b6ce29d Finished fixing the raw Tile altar, and finished the Omega structure. 2015-07-29 15:04:00 -04:00
Arcaratus
419f532502 Finished all Blocks 2015-07-29 14:35:00 -04:00
WayofTime
59b8ecc271 Fixed more issues 2015-07-29 09:08:46 -04:00
WayofTime
c5681dc831 Initial commit of BM 1.8 2015-07-29 08:23:01 -04:00
Arcaratus
c447106cb1 Performance Commit 2 2015-07-28 13:49:26 -04:00
Arcaratus
2d6b1c4462 Add achievements 2015-07-13 14:25:10 -04:00
Arcaratus
09b2c0cbd7 Redo Commit 2015-07-09 11:24:20 -04:00
Arcaratus
c607817bcd Fix #373 and did #375 2015-07-09 11:17:55 -04:00
WayofTime
786498e615 Removed redundant book code. 2015-07-08 22:03:38 -04:00
WayofTime
723a8b4a7e Merge pull request #314 from Adaptivity/master
Make some messages localized serverside
2015-07-07 14:24:17 -04:00
Arcaratus
e5b795fddc Performance Commit --Too lazy to do the Altar recipe 2015-07-02 11:05:07 -04:00
Arcaratus
4f9acb223f Merge remote-tracking branch 'upstream/master' 2015-06-12 15:12:22 -04:00
Arcaratus
90b34056c1 Shtuff 2015-06-12 15:11:56 -04:00
Arcaratus
8d2ab7aa7a Small stuff 2015-06-12 14:53:28 -04:00
WayofTime
7d7db0b60f Upgraded to G-API v19 2015-06-04 17:07:23 -04:00
WayofTime
96a5d93649 Merge pull request #331 from Arcaratus/master
Sigil of Holding remake!
2015-05-18 20:32:19 -04:00
WayofTime
55db2dd3ac A few last minute changes 2015-05-18 20:32:04 -04:00
Arcaratus
0f3c0196cd Sigil of Holding remake! 2015-05-18 18:33:23 -04:00
Arcaratus
9247e66f13 Added in Unbinding Ritual recipes (UnbindingRegistry.registerRecipe(outputItemStack, inputItemStack)) and automatic reversion of registered Binding Recipes. Renamed Binding Ritual class, updated ritual blacklist. Blood Magic, now with 8% more lightning! 2015-05-11 21:38:16 -04:00
Arcaratus
1eefcda6ca Fixed teleposers 2015-05-11 19:08:06 -04:00
Arcaratus
307184fb85 Revert "Fixed Teleposers"
This reverts commit da9866ac8f.
2015-05-11 19:05:14 -04:00
Arcaratus
da9866ac8f Fixed Teleposers 2015-05-11 19:04:37 -04:00
WayofTime
2cc9d3a53a Added the Forestry API 2015-05-11 13:12:56 -04:00
WayofTime
f74e4993cf Updated the books, worked more on the new self-sacrifice mechanics, allowed the teleposer to telepose entities across dimensions, changed the Focus of the Ellipsoid so that it now places blocks from a chest underneath the MRS. 2015-05-04 14:16:58 -04:00
WayofTime
c71edfb937 Added variable incense - issue with build needs to be resolved in build.gradle 2015-05-01 18:56:16 -04:00
WayofTime
f1ebade718 Working on an Incense mechanic... You'll find out! 2015-04-30 09:37:39 -04:00
Anton
47c9c8439d Git why 2015-04-30 15:22:37 +03:00
Anton
0bec104bf6 Solve merge conflicts? 2015-04-30 15:18:55 +03:00
WayofTime
b90db3857b Ritual diviner now auto-constructs rituals. 2015-04-29 17:39:06 -04:00
Anton
47e7cad9e9 Make some messages localized serverside 2015-04-26 13:50:55 +03:00
Arcaratus
31f552fe2d Random stuffs
Updated commands
Added in a ritual hologram --Alex's code
Added a Total Stones tooltip to the ritual diviner
Gave the Alchemy Relay a null bounding box
Added localizations to the blocks that didn't have any
2015-04-18 19:49:09 -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
ab0c49f8c7 General toying with the enchantments for the Omega armour, tweaked the ritual diviner's functionality, fixed teleposers not teleposing players in certain circumstances. 2015-04-08 09:52:51 -04:00
WayofTime
ab8d25db76 Added the Dawn Scribing Tool + Dawn Ritual Stone
Fixed the ISidedInventory nature of the chemistry set
Added the Omega Reaction Chamber for initiating the Omega state
Experimented with enchantments
2015-04-04 16:35:42 -04:00
ljfa-ag
dd041f0842 Remove pointless if statement 2015-03-16 15:06:53 +01:00
ljfa-ag
141fb78feb Make TEWritingTable extend TEInventory 2015-03-04 14:49:48 +01:00
ljfa-ag
f7de2ddef5 Only allow sensible items in Socket and Teleposer 2015-03-04 14:29:17 +01:00
ljfa-ag
252555cb3e Make TETeleposer extend TEInventory 2015-03-04 14:12:44 +01:00
ljfa-ag
3bb437d751 Make TESocket extend TEInventory 2015-03-04 14:10:02 +01:00