AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-26 14:35:04 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,275 Commits 29 Branches 143 Tags
Commit Graph

1275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
4c6af332bc Merge pull request #152 from Vexatos/patch-3 
All; the. punctionation,-.,-'''<^ (Updated de_DE.lang)
 2014-03-09 15:00:42 +01:00
Florian Nücke
55b9eb3f2b Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/component/machine/Machine.scala
 2014-03-09 12:34:12 +01:00
Florian Nücke
f759a06ee3 fixed class transformer in deobf jar 2014-03-09 12:32:00 +01:00
Vexatos
4f6a99df4d All; the. punctionations,-.,-'''<^ 2014-03-09 11:56:52 +01:00
Florian Nücke
ed43b7fe31 cleaned up gradle scripts a little more (pulled version out of base name) 2014-03-09 11:49:48 +01:00
Florian Nücke
dfa24ac35c trying to stabilize the class transformer a little 2014-03-09 11:25:54 +01:00
Florian Nücke
9da741c618 adding saves/[world]/opencomputers/rom/[arch] folder to composite fs for machines, allows easy overriding/adding of stuff in/to the rom without editing the jar; fixed list() in composite fs 2014-03-09 10:43:14 +01:00
Florian Nücke
72abf79b36 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-08 23:09:15 +01:00
Florian Nücke
f0a5945fc3 fixed class name lookup in class transformer when deobfed-to-srg 2014-03-08 23:08:49 +01:00
Florian Nücke
baf007a72a Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-08 22:09:09 +01:00
Florian Nücke
94c1e00399 gradle ate my manifest, so i made it give it back to me 2014-03-08 22:08:48 +01:00
Florian Nücke
92e1abad17 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-08 21:50:11 +01:00
Florian Nücke
0fe1d68935 properly checking index bounds in hologram callbacks, avoids potential crash in update when invalid ones are passed 2014-03-08 21:45:06 +01:00
Florian Nücke
ed7f2f0a21 aaand fixed the return route, too... (cc -> oc networking) 2014-03-08 21:34:14 +01:00
Florian Nücke
d21af5356f Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-08 20:57:56 +01:00
Florian Nücke
aed13e341c Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/Proxy.scala
 2014-03-08 20:57:16 +01:00
Florian Nücke
261aecd6e8 properly synchronizing hologram update to avoid errors when updating the hologram while sending the state 2014-03-08 20:56:13 +01:00
Florian Nücke
20ec45bacd rom isn't shared among computers anymore (i.e. shared handles); fixed swtich block not queuing cc events 2014-03-08 20:52:59 +01:00
Florian Nücke
5b164bd325 basic system for registering file systems for lookup in a machine's rom. this allowed cleaning up the lua implementations a bit, too, since the rom is now managed by the machine itself again; fixed potential NPE when filesystems without a label implementation were created 2014-03-08 20:22:16 +01:00
Florian Nücke
2e85d30eb1 forgot to comment out fmp stuffs 2014-03-08 19:00:14 +01:00
Florian Nücke
c4c5368147 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	build.gradle
 2014-03-08 18:52:49 +01:00
Florian Nücke
8023dd4db6 cleaning up gradle scripts a little, adding maven repo generation for publishing 2014-03-08 18:49:06 +01:00
Florian Nücke
f2435a4413 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-07 13:27:44 +01:00
Florian Nücke
bd4df5b61d fixed an issue that lead to invalid energy states (missing 'else'...), most notably in robots not turning on when too full; added safeguard to avoid excess energy after load to cause trouble in tryChangeBuffer v1.2.2 2014-03-07 13:27:16 +01:00
Florian Nücke
47bd274612 quite obviously not fully awake right now 2014-03-07 11:08:31 +01:00
Florian Nücke
cfd8fb4fff Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Cable.scala
	src/main/scala/li/cil/oc/server/network/Network.scala
 2014-03-07 10:50:38 +01:00
Florian Nücke
01110c0f0e fixed covers from forge multipart not properly blocking cables 2014-03-07 10:48:39 +01:00
Florian Nücke
0f1bac7581 didn't I change this already? 2014-03-07 10:14:28 +01:00
Florian Nücke
dc8a37014b Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-07 09:56:35 +01:00
Florian Nücke
fb15bfcf62 new wrapper to unbreak things again 2014-03-07 09:55:04 +01:00
Florian Nücke
c356341222 changed artifact naming for jenkins 2014-03-07 09:34:00 +01:00
Florian Nücke
d2b04bceff Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	README.md
	build.gradle
	gradle/wrapper/gradle-wrapper.jar
	gradle/wrapper/gradle-wrapper.properties
	src/api/java/universalelectricity/api/CompatibilityModule.java
	src/api/java/universalelectricity/api/energy/IEnergyContainer.java
	src/api/java/universalelectricity/api/energy/IEnergyInterface.java
	src/api/java/universalelectricity/api/net/IConnectable.java
	src/main/java/li/cil/oc/client/TexturePreloader.scala
	src/main/java/li/cil/oc/common/block/Keyboard.scala
	src/main/java/universalelectricity/api/UniversalClass.java
	src/main/scala/li/cil/oc/CraftingHandler.scala
	src/main/scala/li/cil/oc/client/TexturePreloader.scala
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/common/ConnectionHandler.scala
	src/main/scala/li/cil/oc/common/block/Keyboard.scala
	src/main/scala/li/cil/oc/common/block/KeyboardDeprecated.scala
	src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala
	src/main/scala/li/cil/oc/common/tileentity/Hologram.scala
	src/main/scala/li/cil/oc/server/TickHandler.scala
	src/main/scala/li/cil/oc/util/mods/UniversalElectricity.scala
 2014-03-07 09:30:26 +01:00
Florian Nücke
d1ee3ef567 java goes to java 2014-03-07 09:23:06 +01:00
Florian Nücke
248d4da9ec updated readme regarding dev env/compiling 2014-03-07 08:00:50 +01:00
Florian Nücke
064a8520f9 fixed crash when using analyzer on hologram projector (and other sided environments returning returning null on some sides), closes #148; made the analyzer work on any side of the hologram projector 2014-03-07 07:50:24 +01:00
Florian Nücke
376d780042 sorted out libraries with gradle (without having to have them in the repo, even!). thanks bop! 2014-03-07 06:50:54 +01:00
Florian Nücke
97353c44ee going gradle 2014-03-06 21:35:36 +01:00
Florian Nücke
79ff3e1732 using same version number for mc1.7 as for 1.6 now, since they're feature identical after all (well, except for mod dependencies of course) 2014-03-06 19:02:22 +01:00
Florian Nücke
c7f133f406 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-06 17:57:36 +01:00
Florian Nücke
2429733d04 bump api version number; added private constructor to CreativeTab api class 2014-03-06 17:57:16 +01:00
Florian Nücke
f0fcc61c8a fixed for 1.7 2014-03-06 17:45:41 +01:00
Florian Nücke
6da691b022 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/Proxy.scala
 2014-03-06 17:43:42 +01:00
Florian Nücke
37911e04d9 make computer.energy() return math.huge (positive infinity) when power use is disabled (in config or ue missing); added api classes to access oc's blocks, items and creative tab 2014-03-06 17:42:28 +01:00
Florian Nücke
10f3ca8a3f Merge pull request #147 from cazzar/MC1.7 
Added gradle wrapper and dev+api artifacts.
 2014-03-06 15:40:02 +01:00
Cayde Dixon
3020fb74e7 Added gradle wrapper and dev+api artifacts. 2014-03-07 01:33:29 +11:00
Florian Nücke
88cecdfc7e Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-06 13:22:32 +01:00
Florian Nücke
5a07cb4748 fixed hologram projector connectivity check being purely visual, also only allow connection from below because cables going in from the side looks really stupid 2014-03-06 11:59:50 +01:00
Florian Nücke
1d598367bb wireless router now also injects received wireless messages into adjacent cc computers 2014-03-06 11:11:16 +01:00
Florian Nücke
954055b91e disabled the pseudo-port of UE in the mod to avoid potential conflicts/incompatibilities with UE for 1.7, will re-enable / upgrade as soon as UE is available for MC 1.7 2014-03-05 21:51:43 +01:00
Florian Nücke
166e191030 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-05 21:46:21 +01:00