tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity
1224 commits 2 branches 0 tags 102 MiB
Commit graph

856 commits

Author SHA1 Message Date
Aidan Brady
2cf6fdc18c Lots more work 2013-12-20 19:12:33 -05:00
Aidan Brady
7bb6b2761b Base code done, onto actual implementation 2013-12-20 18:29:22 -05:00
Aidan Brady
2fcbbcfa6a Loads of work on transporters 2013-12-20 18:14:31 -05:00
Aidan Brady
f2d202d90f Work on transporters 2013-12-20 17:46:24 -05:00
Aidan Brady
40e2d3b7fc Bump version, work on multipart transporters 2013-12-20 16:47:09 -05:00
Aidan C. Brady
0ab803feeb Rename Object3D to Coord4D, work on balloons 2013-12-20 16:09:09 -05:00
Aidan Brady
48af6f8fcc Balloons :) 2013-12-20 13:27:54 -05:00
Aidan Brady
0367e62b34 Custom particles for different colors when breaking balloon 2013-12-20 01:17:54 -05:00
Aidan Brady
510debc0fb Kill induction module and start on balloons :) 2013-12-20 01:05:41 -05:00
Aidan Brady
6b5f8833f0 Have Logistical Transporters use interfaces instead of directly referencing classes; should make multipart support easy 2013-12-19 18:21:12 -05:00
Aidan Brady
fbed46c0d9 More fixes 2013-12-19 16:55:41 -05:00
Aidan Brady
abaef2fd6d Work on connections 2013-12-19 16:32:00 -05:00
Aidan Brady
a57f5c4fd7 Merge branch 'master' into development 2013-12-18 19:20:54 -05:00
Aidan Brady
f7f9da8ae9 Fixed Digital Miner crash, made things efficient, fixed dupe bug 2013-12-18 18:57:15 -05:00
Aidan Brady
4cd1c8f4f7 Fix a few crashes 2013-12-18 18:39:49 -05:00
Aidan Brady
8f24e5c18f Got connection types to save/load, NONE sides will now not connect or emit to acceptors 2013-12-18 16:23:07 -05:00
Aidan Brady
c5269cc1ab Fix a few crashes, begin actual side-based implementation 2013-12-18 16:09:30 -05:00
Aidan Brady
4d6a2a31b1 Removed println 2013-12-18 14:36:25 -05:00
Ben Spiers
52939f763b Large Model variants. Fluid contents rendering still needs work but that's not using an obj model. It could potentially; it would be a lot cleaner in code but would mean a *lot* of blender work. 2013-12-18 18:42:05 +00:00
Aidan C. Brady
fa10c2ecb1 Add upgrade modifier config 2013-12-18 13:19:08 -05:00
Aidan C. Brady
4964c1689f Tiny cleanup 2013-12-18 12:39:37 -05:00
Aidan C. Brady
854c909c4c Merge branch 'master' into development 2013-12-18 12:07:52 -05:00
Aidan C. Brady
65c201d829 Add try/catch to prevent OreDict iteration GUI render crash 2013-12-18 12:05:09 -05:00
Aidan C. Brady
6ae1177c8e Fix that horrible Digital Miner bug once and for all 2013-12-18 11:52:24 -05:00
Aidan C. Brady
345f5f7b30 Remove println 2013-12-18 11:45:13 -05:00
Aidan C. Brady
5372bc66d6 More intelligent client-side scales 2013-12-18 11:19:30 -05:00
Aidan Brady
0317f81e06 Attempt to fix client render 2013-12-18 07:24:59 -05:00
Aidan Brady
31d9275c7a Fixed split energy calculations, fixed gas rendering 2013-12-17 22:37:21 -05:00
Aidan C. Brady
4d84386b8e Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-17 22:25:58 -05:00
Aidan C. Brady
1152470dd6 Hopefully fixed an issue 2013-12-17 22:25:54 -05:00
Aidan Brady
7c0b26880c Fixed jetpack kicking players 2013-12-17 20:58:30 -05:00
Aidan C. Brady
25699f969d Fix client update 2013-12-17 20:55:53 -05:00
Aidan C. Brady
fed49fbb05 Cleanup, fix a few things 2013-12-17 20:42:52 -05:00
Aidan C. Brady
4f5c26b0d2 Fixed a bunch of bugs - think that Pressurized Tubes and Mechanical Pipes are done for the most part 2013-12-17 20:28:25 -05:00
Aidan C. Brady
e7cc127bb2 Removed now-useless checks 2013-12-17 18:27:44 -05:00
Aidan C. Brady
dc6128a88c Fixed bad check 2013-12-17 18:21:13 -05:00
Aidan C. Brady
cf0ad408dd Work on Mechanical Pipes 2013-12-17 18:20:18 -05:00
Aidan C. Brady
a601def4f6 More rendering; for some reason mech pipes are screwing up cache load 2013-12-17 15:54:06 -05:00
Aidan C. Brady
350ad4c22e Rendering looks cool :) 2013-12-17 15:36:25 -05:00
Ben Spiers
ed2a5233ae Fix models for large transmitters 2013-12-17 20:02:29 +00:00
Ben Spiers
b4b8ddf62a Clean up unused imports 2013-12-17 20:02:29 +00:00
Ben Spiers
8199408e75 Side-specific changeable models. They don't behave differently yet but that should be possible now without too much trouble. 2013-12-17 20:02:29 +00:00
Aidan C. Brady
4a7b862fb7 Use defined scale to calculate when to send updates, atm 100 possible packet stages 2013-12-17 14:57:19 -05:00
Aidan C. Brady
60e2666a29 Render defined scale properly 2013-12-17 14:45:30 -05:00
Aidan C. Brady
ffd683a3f3 Fixed rendering 2013-12-17 14:39:30 -05:00
Aidan C. Brady
a309e88b2b Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-17 14:02:34 -05:00
Aidan C. Brady
6f26d01d6b Fix tiny fluid cache issue 2013-12-17 14:02:28 -05:00
Aidan Brady
a3529a12d7 Fix a few bugs 2013-12-17 13:23:29 -05:00
Aidan C. Brady
4e74995143 Got some serious work done on Gas and Fluid network logistics 2013-12-17 12:53:33 -05:00
Ben Spiers
3a97630f55 Add new shapes to small model. 2013-12-17 02:21:30 +00:00
Aidan Brady
cd80bfc6cd Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-16 19:08:58 -05:00
Aidan Brady
b78b1dc850 EnergyNetwork distribution merge/split complete, will do fluid and gas stuff tomorrow 2013-12-16 19:08:52 -05:00
Ben Spiers
01818d4e26 Fix up the redstone switching/cover blocking support a bit. 2013-12-16 23:55:42 +00:00
Aidan Brady
7730649ab3 Pushing this before I forget - lots of printlns! 2013-12-16 18:39:58 -05:00
Aidan Brady
bdf4efecda Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-16 17:54:32 -05:00
Aidan Brady
6598295e3e Work on Universal Cable split logistics, I think I got this @unpairedbracket 2013-12-16 17:54:27 -05:00
Ben Spiers
b0e2401b06 Fix a StackOverflow 2013-12-16 21:34:02 +00:00
Aidan C. Brady
5272d169c4 Fixed a few bugs in the split() method and added in some new functionality for splitting of energy/fluid/gas! Unpairedbracket, shouldn't hurt you unless you modified split() 2013-12-16 15:00:57 -05:00
Aidan C. Brady
869660d8bf Glowstone armor now glows 2013-12-16 12:21:49 -05:00
Aidan C. Brady
00b666a779 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-16 11:16:17 -05:00
Aidan C. Brady
a93d51a4a1 Added a handy double split tool to ListUtils, may be useful to you in network splitting @unpairedbracket; takes in a double, divides it into a defined amount of segments, giving the top element the remains 2013-12-16 11:16:10 -05:00
Ben Spiers
ab6da7571d Improve the FluidNetwork's reporting of stored/flowing fluid a bit 2013-12-16 15:57:04 +00:00
Ben Spiers
79e8b36a4b Fix a few crashes 2013-12-16 15:57:03 +00:00
Ben Spiers
c7a22b7cfd Oops 2013-12-16 15:57:03 +00:00
Aidan C. Brady
646b22f5b5 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 
Conflicts:
	common/mekanism/common/multipart/PartTransmitter.java
 2013-12-16 09:56:01 -05:00
Aidan C. Brady
4ff79409f6 Work on saving and loading of transmitter caches 2013-12-16 09:51:07 -05:00
Ben Spiers
1534d1cb14 Make a start on Multipart Transporters. 2013-12-16 14:00:43 +00:00
Aidan C. Brady
8de6b8754f Remove parts of UE prefab that are unneeded 2013-12-16 07:31:34 -05:00
Aidan C. Brady
4aa91b13ee Killed off CalclaviaLib 2013-12-16 07:28:55 -05:00
Aidan C. Brady
c44b63fa3a Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-16 07:23:39 -05:00
Aidan C. Brady
3741488322 Hopefully fix CME 2013-12-16 07:23:33 -05:00
Aidan Brady
834abd46fe Fix a few bugs 2013-12-16 07:03:47 -05:00
Aidan Brady
389f3cd988 Merge branch 'master' into development 
Conflicts:
	common/mekanism/common/tileentity/TileEntityChemicalFormulator.java
 2013-12-15 23:22:39 -05:00
Aidan Brady
98c56904e1 Merge “Fix crash” 2013-12-15 23:15:01 -05:00
Aidan Brady
50b98674ed Fix crashes 2013-12-15 23:01:36 -05:00
Aidan Brady
2404e7416a Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-15 19:08:16 -05:00
Aidan Brady
8b0d18e469 Tiny cleanup 2013-12-15 19:08:13 -05:00
Aidan C. Brady
37a1a0ab40 Jetpack and gas mask practically done :) 2013-12-15 18:54:43 -05:00
Aidan Brady
d21ef524a0 Work on jetpacks/scuba stuff 2013-12-15 16:07:30 -05:00
Aidan Brady
8057d605a1 Merge branch 'master' into development 2013-12-15 14:19:57 -05:00
Aidan Brady
5cd968f09c Fixed bin bug 2013-12-15 14:19:16 -05:00
Aidan Brady
a6887eb813 Fixed tank crash 2013-12-15 00:43:47 -05:00
Aidan Brady
945aff6986 Fixed gas/fluid transfer 2013-12-15 00:03:45 -05:00
Aidan Brady
f6043b6a62 Fixed miner issues 2013-12-14 23:45:51 -05:00
Aidan C. Brady
0414b0af99 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-14 22:54:32 -05:00
Aidan Brady
907bd10b0f Merge branch 'master' into development 2013-12-14 22:50:48 -05:00
Aidan Brady
c73259f092 Killed off old TE API, moved PipeUtils to proper loc 2013-12-14 22:50:37 -05:00
Aidan C. Brady
8edd4fcfa7 Work on Chemical Infuser/Formulator official implementation (without models yet) 2013-12-14 22:29:25 -05:00
Aidan Brady
345aecb4db Merge branch 'master' into development 2013-12-14 17:58:13 -05:00
Aidan Brady
9558c6f6ca Fix GregTech conflict 2013-12-14 17:58:01 -05:00
Aidan C. Brady
79f77dbdeb Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-14 15:36:16 -05:00
Ben Spiers
a92a05a720 Make universal cables display power a bit more nicely. 2013-12-14 20:33:17 +00:00
Ben Spiers
32f113ad77 First steps towards more dynamic capacity system to allow for differing capacity of universal cables in the future. Will optimise later. 2013-12-14 20:32:32 +00:00
Aidan C. Brady
bb8b89b7e7 Work on dynamic rendering based on both buffer amount and average transfer 2013-12-14 15:30:41 -05:00
Aidan C. Brady
1e1eabfd5e Even more localization, fixed a few tiny bugs 2013-12-14 15:13:12 -05:00
Aidan C. Brady
acdbf1f3cb Core code for Fluid and Gas networks 2013-12-14 00:36:52 -05:00
Aidan Brady
efc98114e8 Core code for new energy framework. Still to do FluidNetwork and GasNetwork. 2013-12-13 23:42:27 -05:00
Aidan Brady
ea57bb5990 Fix crash 2013-12-13 23:03:20 -05:00
Aidan Brady
7555fbee7c Update UE 2013-12-13 17:15:53 -05:00
Aidan Brady
a05870a2ef A few fixes 2013-12-13 17:13:46 -05:00
Aidan Brady
0a0f3a1779 Minor cleanup 2013-12-13 07:02:13 -05:00
Aidan Brady
705b2b4528 Add TE support to Universal Cables, implemented Mechanical Pipe suck mode 2013-12-13 00:16:06 -05:00
Aidan Brady
cb69ff842e Fix bounds on big transmitters 2013-12-13 00:01:54 -05:00
Aidan Brady
c85bb7f9cc Add missing renderer 2013-12-12 23:36:55 -05:00
Aidan Brady
74d41073a6 Fixes, but getting an error for some reason 2013-12-12 23:08:16 -05:00
Aidan Brady
a68468b82e Fix merge 2013-12-12 22:37:14 -05:00
Aidan Brady
11c7efd8fc Merge branch 'api-change' into multipart-experimental-new 2013-12-12 22:36:00 -05:00
Aidan Brady
0e35aca15a Rendering enhancements 2013-12-12 22:31:27 -05:00
Aidan Brady
6f99805443 Fix crash 2013-12-12 22:02:34 -05:00
Aidan Brady
4316103022 Fixes 2013-12-12 21:35:17 -05:00
Ben Spiers
55dd8f5bf9 Make other transmitters work visually again, make the unicable's transparency more of a smooth exponential decay type thing and remove it's weird noop constructor 2013-12-13 01:58:25 +00:00
Aidan Brady
2d5b633168 Work on stuff 2013-12-12 20:35:37 -05:00
Aidan Brady
11aa04a5df A few charging fixes 2013-12-12 19:46:23 -05:00
Aidan Brady
9ecb7c20fd More work on Infuser 2013-12-12 19:04:02 -05:00
Aidan Brady
43d3050b40 Work on Chemical Infuser 2013-12-12 18:33:56 -05:00
Aidan C. Brady
338da4d92c Work on a more intuitive form of accepting gas in items and blocks 2013-12-12 16:54:55 -05:00
Ben Spiers
98c8068a0f Get Mechanical Pipe rendering working a bit better. 2013-12-12 20:23:03 +00:00
Aidan C. Brady
85a2c981df Fixed Adv Solar Generator config 2013-12-12 13:56:00 -05:00
Aidan Brady
31f8566a1f Merge branch 'master' into multipart-experimental-new 
Conflicts:
	common/mekanism/common/Mekanism.java
 2013-12-12 08:43:21 -05:00
Ben Spiers
c1318d998b Merge, hopefully without screwing too much up. 2013-12-12 01:56:05 +00:00
Aidan Brady
faa127ddd8 Add textures for Sulfuric Gas & Sulfuric Acid 2013-12-11 20:46:39 -05:00
Aidan Brady
5a241ce8ee Work on GUIs 2013-12-11 20:24:37 -05:00
Aidan Brady
6114463852 Work on TileEntity code of Chemical Formulator 2013-12-11 19:53:12 -05:00
Aidan Brady
7a3c678d76 Work on new machines 2013-12-11 18:26:10 -05:00
Aidan Brady
123ae05dcd Cleaned up contractor code 2013-12-11 18:10:01 -05:00
Aidan Brady
2d626f2279 Work on Chemical Infuser & Chemical Formulator recipe system 2013-12-11 17:08:15 -05:00
Aidan C. Brady
7e48fa2743 Work on container code 2013-12-11 16:34:54 -05:00
Aidan C. Brady
a4e8158448 Add GUIs for T3 ore processing machinery 2013-12-10 18:51:16 -05:00
Aidan Brady
250ddadcf0 Dictionary! :) 2013-12-09 20:52:49 -05:00
Aidan Brady
3c4d776e24 Added lead ore processing 2013-12-09 18:30:50 -05:00
Aidan Brady
add3cf0bf6 Bug fixes! 2013-12-09 17:54:59 -05:00
Aidan Brady
ac31fc2b4e More work on networking system, unstable 2013-12-09 17:34:53 -05:00
Aidan Brady
26f0f83574 Work on initial data system for jetpacks/gasmasks 2013-12-09 17:08:47 -05:00
Aidan Brady
44a69da8a1 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-12-09 17:00:29 -05:00
Aidan Brady
7506b8fed8 Fix particles 2013-12-09 17:00:21 -05:00
Aidan C. Brady
54a10af2d7 A few tiny fixes 2013-12-09 17:00:08 -05:00
Aidan C. Brady
5661b20b27 A few fixes 2013-12-09 11:56:48 -05:00
Aidan C. Brady
4035ba9b36 Add overlay for scuba tank 2013-12-09 09:52:49 -05:00
Aidan Brady
13b8c3f793 Fix MI config 2013-12-09 07:25:11 -05:00
Aidan Brady
4ebf11ed5a Fix crash 2013-12-09 07:19:16 -05:00
Aidan Brady
781aef807c Add lapis lazuli dust Enrichment Chamber recipe 2013-12-09 07:11:00 -05:00
Aidan Brady
4125ef57c6 minor changes 2013-12-08 21:40:00 -05:00
Aidan Brady
0d830d6136 Attempt a few jetpack fixes 2013-12-08 20:35:45 -05:00
Aidan Brady
8b25c1acb3 Attempt to fix a few jetpack bugs 2013-12-08 20:22:04 -05:00
Aidan Brady
af1f32da8e Fix double chest crash 2013-12-08 19:22:59 -05:00
Aidan Brady
d2753abc92 Fixed tiny factory sort issue 2013-12-08 16:39:03 -05:00
Aidan C. Brady
ce629e218c Fix IC2 charging 2013-12-08 16:10:52 -05:00
Aidan C. Brady
8289af18fd Add configurable sound volume for all Mekanism sounds 2013-12-08 12:49:48 -05:00
Aidan Brady
eb8e02a39a Fix a few bugs! 2013-12-08 12:39:26 -05:00
Aidan Brady
97bf92375a Add class enumerator for future class stuff 2013-12-08 00:43:20 -05:00